X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-api.lisp;h=59cbe8c60692dbbcd2ec2f554cc907e6bf31316b;hp=026bde07744211ace6735979ac06b812203152d7;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=5f548b417f69de4a45a29fcddf3a6e9b02519752 diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp index 026bde0..59cbe8c 100644 --- a/db-mysql/mysql-api.lisp +++ b/db-mysql/mysql-api.lisp @@ -309,17 +309,6 @@ :module "mysql" :returning (* mysql-mysql)) -#-mysql-client-v4 -(declaim (inline mysql-connect)) -#-mysql-client-v4 -(uffi:def-function "mysql_connect" - ((mysql (* mysql-mysql)) - (host :cstring) - (user :cstring) - (passwd :cstring)) - :module "mysql" - :returning (* mysql-mysql)) - ;; Need to comment this out for LW 4.2.6 ;; ? bug in LW version #-lispworks (declaim (inline mysql-real-connect)) @@ -366,24 +355,6 @@ :module "mysql" :returning :int) -#-mysql-client-v4 -(declaim (inline mysql-create-db)) -#-mysql-client-v4 -(uffi:def-function "mysql_create_db" - ((mysql (* mysql-mysql)) - (db :cstring)) - :module "mysql" - :returning :int) - -#-mysql-client-v4 -(declaim (inline mysql-drop-db)) -#-mysql-client-v4 -(uffi:def-function "mysql_drop_db" - ((mysql (* mysql-mysql)) - (db :cstring)) - :module "mysql" - :returning :int) - (declaim (inline mysql-shutdown)) (uffi:def-function "mysql_shutdown" ((mysql (* mysql-mysql))) @@ -655,10 +626,10 @@ (defun mysql-num-rows (res) (uffi:with-foreign-object (p-high32 :unsigned-int) (let ((low32 (clsql-mysql-num-rows res p-high32)) - (high32 (uffi:deref-pointer p-high32 :unsigned-int))) + (high32 (uffi:deref-pointer p-high32 :unsigned-int))) (if (zerop high32) - low32 - (make-64-bit-integer high32 low32))))) + low32 + (make-64-bit-integer high32 low32))))) (uffi:def-function "clsql_mysql_affected_rows" ((mysql (* mysql-mysql)) @@ -669,10 +640,10 @@ (defun mysql-affected-rows (mysql) (uffi:with-foreign-object (p-high32 :unsigned-int) (let ((low32 (clsql-mysql-affected-rows mysql p-high32)) - (high32 (uffi:deref-pointer p-high32 :unsigned-int))) + (high32 (uffi:deref-pointer p-high32 :unsigned-int))) (if (zerop high32) - low32 - (make-64-bit-integer high32 low32))))) + low32 + (make-64-bit-integer high32 low32))))) (uffi:def-function "clsql_mysql_insert_id" ((res (* mysql-mysql)) @@ -683,9 +654,9 @@ (defun mysql-insert-id (mysql) (uffi:with-foreign-object (p-high32 :unsigned-int) (let ((low32 (clsql-mysql-insert-id mysql p-high32)) - (high32 (uffi:deref-pointer p-high32 :unsigned-int))) + (high32 (uffi:deref-pointer p-high32 :unsigned-int))) (if (zerop high32) - low32 + low32 (make-64-bit-integer high32 low32)))))