X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-client-info.lisp;h=d27c7589a48dfb5dfde0c880ab50e7d62e58362f;hp=5cb8d0e26a912a5b97320267e4755e7c7016f3fc;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=23b76563b25a517ad20f29d6dc5a65c8b958a042

diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp
index 5cb8d0e..d27c758 100644
--- a/db-mysql/mysql-client-info.lisp
+++ b/db-mysql/mysql-client-info.lisp
@@ -7,10 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  April 2004
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
+;;;; 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
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -24,18 +21,29 @@
 (defvar *mysql-client-info* nil)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (uffi:def-function "mysql_get_client_info"
+  (uffi:def-function ("mysql_get_client_info" mysql-get-client-info)
       ()
     :module "mysql"
     :returning :cstring)
 
   (setf *mysql-client-info* (uffi:convert-from-cstring (mysql-get-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*))
-    (t
-     (error "Unknown mysql client version '~A'." *mysql-client-info*))))
+
+
+  (when (and (stringp *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*)))
+      ((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*)))))