X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-client-info.lisp;h=d27c7589a48dfb5dfde0c880ab50e7d62e58362f;hb=10639814d311ca88255cd32f7270a5df5d4fcf4c;hp=23161efed50af6af54efda09e7c60cebc36ec476;hpb=7a01154e40dd4516ece2ebe2267a11dec1f9a18f;p=clsql.git diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp index 23161ef..d27c758 100644 --- a/db-mysql/mysql-client-info.lisp +++ b/db-mysql/mysql-client-info.lisp @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: April 2004 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -30,16 +28,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*)))))