projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9527: add function declarations for prepared statements
[clsql.git]
/
db-mysql
/
mysql-sql.lisp
diff --git
a/db-mysql/mysql-sql.lisp
b/db-mysql/mysql-sql.lisp
index f85ffac9abcf37698a5316f31b2937b256aef7f8..e677c5a05204c683fb28aed70de7e62ace028424 100644
(file)
--- a/
db-mysql/mysql-sql.lisp
+++ b/
db-mysql/mysql-sql.lisp
@@
-117,7
+117,7
@@
db-native 0 socket-native 0))
(progn
(setq error-occurred t)
db-native 0 socket-native 0))
(progn
(setq error-occurred t)
- (error 'sql-connect-error
+ (error 'sql-connect
ion
-error
:database-type database-type
:connection-spec connection-spec
:error-id (mysql-errno mysql-ptr)
:database-type database-type
:connection-spec connection-spec
:error-id (mysql-errno mysql-ptr)
@@
-442,12
+442,12
@@
t)
(defmethod db-type-has-views? ((db-type (eql :mysql)))
t)
(defmethod db-type-has-views? ((db-type (eql :mysql)))
- ;; MySQL 4.1 will apparently have views, need to check *mysql-client-info*
- nil)
+ #+mysql-client-v5.1 t
+
#-mysql-client-v5.1
nil)
(defmethod db-type-has-subqueries? ((db-type (eql :mysql)))
(defmethod db-type-has-subqueries? ((db-type (eql :mysql)))
- ;; MySQL 4.1 will apparently have subqueries, need to check *mysql-client-info*
- nil)
+ #+mysql-client-v4.1 t
+
#-mysql-client-v4.1
nil)
(defmethod db-type-has-boolean-where? ((db-type (eql :mysql)))
nil)
(defmethod db-type-has-boolean-where? ((db-type (eql :mysql)))
nil)
@@
-459,6
+459,10
@@
(let ((tuple (car (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto nil))))
(and tuple (string-equal "YES" (second tuple)))))
(let ((tuple (car (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto nil))))
(and tuple (string-equal "YES" (second tuple)))))
+(defmethod db-type-has-prepared-stmt? ((db-type (eql :mysql)))
+ #+mysql-client-v4.1 t
+ #-mysql-client-v4.1 nil)
+
(when (clsql-sys:database-type-library-loaded :mysql)
(clsql-sys:initialize-database-type :database-type :mysql))
(when (clsql-sys:database-type-library-loaded :mysql)
(clsql-sys:initialize-database-type :database-type :mysql))