X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-sql.lisp;h=e677c5a05204c683fb28aed70de7e62ace028424;hb=fa8bab0b07d9aa9f1c546920971f41252434e285;hp=f85ffac9abcf37698a5316f31b2937b256aef7f8;hpb=8c6c643e3debe875bd14408cc3129d8148dfd125;p=clsql.git diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index f85ffac..e677c5a 100644 --- 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) - (error 'sql-connect-error + (error 'sql-connection-error :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))) - ;; 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))) - ;; 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) @@ -459,6 +459,10 @@ (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))