X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-api.lisp;h=196a823cbf84fc0d2fe9b361bed174cedd2ddb9a;hb=e132f72fe34b078ca642ec99d1415f6b9511d598;hp=7170fda066b72a29f480c80e0dc04422eecb5c1f;hpb=43ec897ec7d84892fa59cc9b7858ce23d64a8a1a;p=clsql.git

diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index 7170fda..196a823 100644
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -118,17 +118,40 @@
   (decimals :unsigned-int))
 
 ;; structure changed in mysql 4 client
-#+mysql-client-v4
+#+(and mysql-client-v4 (not mysql-client-v4.1))
 (uffi:def-struct mysql-field
     (name (* :char))
   (table (* :char))
   (org_table (* :char))
   (db (* :char))
   (def (* :char))
-  (length :unsigned-int)
-  (max-length :unsigned-int)
+  (length :unsigned-long)
+  (max-length :unsigned-long)
+  (flags :unsigned-int)
+  (decimals :unsigned-int)
+  (type mysql-field-types))
+
+#+mysql-client-v4.1
+(uffi:def-struct mysql-field
+    (name (* :char))
+  (org_table (* :char))
+  (table (* :char))
+  (org_table (* :char))
+  (db (* :char))
+  (catalog_db (* :char))
+  (def (* :char))
+  (length :unsigned-long)
+  (max-length :unsigned-long)
+  (name-length :unsigned-int)
+  (org-name-length :unsigned-int)
+  (table-length :unsigned-int)
+  (org-table-length :unsigned-int)
+  (db-length :unsigned-int)
+  (catalog-length :unsigned-int)
+  (def-length :unsigned-int)
   (flags :unsigned-int)
   (decimals :unsigned-int)
+  (charsetnr :unsigned-int)
   (type mysql-field-types))
 
 ;;; MYSQL-ROWS
@@ -269,7 +292,7 @@
      (db :cstring)
      (port :unsigned-int)
      (unix-socket :cstring)
-     (clientflag :unsigned-int))
+     (clientflag :unsigned-long))
   :module "mysql"
   :returning (* mysql-mysql))