projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9464: * db-oracle/oracle-sql.lisp: Don't trim trailing spaces
[clsql.git]
/
db-mysql
/
mysql-api.lisp
diff --git
a/db-mysql/mysql-api.lisp
b/db-mysql/mysql-api.lisp
index b3220b7bc99a44b72041cdc3bebe6e5191f3ebca..c27a50eca26fd3fb363ddd823e58063d8947c4c5 100644
(file)
--- a/
db-mysql/mysql-api.lisp
+++ b/
db-mysql/mysql-api.lisp
@@
-106,11
+106,7
@@
(: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
+#+mysql-client-v3
(uffi:def-struct mysql-field
(name (* :char))
(table (* :char))
(uffi:def-struct mysql-field
(name (* :char))
(table (* :char))
@@
-122,15
+118,15
@@
(decimals :unsigned-int))
;; structure changed in mysql 4 client
(decimals :unsigned-int))
;; structure changed in mysql 4 client
-#+
:
mysql-client-v4
+#+mysql-client-v4
(uffi:def-struct mysql-field
(name (* :char))
(table (* :char))
(org_table (* :char))
(db (* :char))
(def (* :char))
(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))
(flags :unsigned-int)
(decimals :unsigned-int)
(type mysql-field-types))
@@
-264,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)
@@
-370,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)))