projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9467: add properties
[clsql.git]
/
db-mysql
/
mysql-api.lisp
diff --git
a/db-mysql/mysql-api.lisp
b/db-mysql/mysql-api.lisp
index d49a0894d943f292722219f124b57f00aa8a38c0..c27a50eca26fd3fb363ddd823e58063d8947c4c5 100644
(file)
--- a/
db-mysql/mysql-api.lisp
+++ b/
db-mysql/mysql-api.lisp
@@
-106,10
+106,6
@@
(:var-string 253)
(:string 254)))
(:var-string 253)
(:string 254)))
-#-(or mysql-client-v3 mysql-client-v4)
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (pushnew :mysql-client-v3 cl:*features*))
-
#+mysql-client-v3
(uffi:def-struct mysql-field
(name (* :char))
#+mysql-client-v3
(uffi:def-struct mysql-field
(name (* :char))
@@
-129,8
+125,8
@@
(org_table (* :char))
(db (* :char))
(def (* :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))
(flags :unsigned-int)
(decimals :unsigned-int)
(type mysql-field-types))
@@
-251,7
+247,9
@@
:module "mysql"
:returning (* mysql-mysql))
:module "mysql"
:returning (* mysql-mysql))
+#-mysql-client-v4
(declaim (inline mysql-connect))
(declaim (inline mysql-connect))
+#-mysql-client-v4
(uffi:def-function "mysql_connect"
((mysql (* mysql-mysql))
(host :cstring)
(uffi:def-function "mysql_connect"
((mysql (* mysql-mysql))
(host :cstring)
@@
-262,7
+260,7
@@
;; Need to comment this out for LW 4.2.6
;; ? bug in LW version
;; Need to comment this out for LW 4.2.6
;; ? bug in LW version
-
;;
(declaim (inline mysql-real-connect))
+
#-lispworks
(declaim (inline mysql-real-connect))
(uffi:def-function "mysql_real_connect"
((mysql (* mysql-mysql))
(host :cstring)
(uffi:def-function "mysql_real_connect"
((mysql (* mysql-mysql))
(host :cstring)
@@
-306,14
+304,18
@@
:module "mysql"
:returning :int)
:module "mysql"
:returning :int)
+#-mysql-client-v4
(declaim (inline mysql-create-db))
(declaim (inline mysql-create-db))
+#-mysql-client-v4
(uffi:def-function "mysql_create_db"
((mysql (* mysql-mysql))
(db :cstring))
:module "mysql"
:returning :int)
(uffi:def-function "mysql_create_db"
((mysql (* mysql-mysql))
(db :cstring))
:module "mysql"
:returning :int)
+#-mysql-client-v4
(declaim (inline mysql-drop-db))
(declaim (inline mysql-drop-db))
+#-mysql-client-v4
(uffi:def-function "mysql_drop_db"
((mysql (* mysql-mysql))
(db :cstring))
(uffi:def-function "mysql_drop_db"
((mysql (* mysql-mysql))
(db :cstring))
@@
-364,12
+366,6
@@
:module "mysql"
:returning :cstring)
:module "mysql"
:returning :cstring)
-(declaim (inline mysql-get-client-info))
-(uffi:def-function "mysql_get_client_info"
- ()
- :module "mysql"
- :returning :cstring)
-
(declaim (inline mysql-get-host-info))
(uffi:def-function "mysql_get_host_info"
((mysql (* mysql-mysql)))
(declaim (inline mysql-get-host-info))
(uffi:def-function "mysql_get_host_info"
((mysql (* mysql-mysql)))