X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-client-info.lisp;h=54d97243a8bc46e1316809766f6c303a68755c0e;hp=23161efed50af6af54efda09e7c60cebc36ec476;hb=e7a577db720298ca6152c2da92f4aed647ee43c8;hpb=7a01154e40dd4516ece2ebe2267a11dec1f9a18f diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp index 23161ef..54d9724 100644 --- a/db-mysql/mysql-client-info.lisp +++ b/db-mysql/mysql-client-info.lisp @@ -30,16 +30,22 @@ (setf *mysql-client-info* (uffi:convert-from-cstring (mysql-get-client-info))) + (when (and (stringp *mysql-client-info*) - (plusp (length *mysql-client-info*))) + (plusp (length *mysql-client-info*))) (cond ((eql (schar *mysql-client-info* 0) #\3) (pushnew :mysql-client-v3 cl:*features*)) ((eql (schar *mysql-client-info* 0) #\4) (pushnew :mysql-client-v4 cl:*features*) (when (and (>= (length *mysql-client-info*) 3) - (string-equal "4.1" *mysql-client-info* :end2 3)) - (pushnew :mysql-client-v4.1 cl:*features*))) + (string-equal "4.1" *mysql-client-info* :end2 3)) + (pushnew :mysql-client-v4.1 cl:*features*))) + ((eql (schar *mysql-client-info* 0) #\5) + (pushnew :mysql-client-v5 cl:*features*) + (when (and (>= (length *mysql-client-info*) 3) + (string-equal "5.1" *mysql-client-info* :end2 3)) + (pushnew :mysql-client-v5.1 cl:*features*))) (t (error "Unknown mysql client version '~A'." *mysql-client-info*)))))