r9178: add mysql client 4.1 version detection

diff --git a/ChangeLog b/ChangeLog
index 0e0d379c05aad50b1e391ed73b1079d009076841..1aa949942d53848407d4780c1b53f65a37684986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+29 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.9.6-pre1
+       * db-mysql/mysql-client-info.lisp: Add client version 4.1
+       detection
+
 28 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.9.5
        * db-mysql/mysql-sql.lisp: Fix bug in transaction capability

diff --git a/db-mysql/mysql-client-info.lisp b/db-mysql/mysql-client-info.lisp
index 5cb8d0e26a912a5b97320267e4755e7c7016f3fc..e4435083d317d54293a65aba3621921feeff2923 100644 (file)
--- a/db-mysql/mysql-client-info.lisp
+++ b/db-mysql/mysql-client-info.lisp
@@ -9,8 +9,7 @@
 ;;;;
 ;;;; $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
@@ -30,12 +29,17 @@
     :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*))
+     (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)))
     (t
-     (error "Unknown mysql client version '~A'." *mysql-client-info*))))
+     (error "Unknown mysql client version '~A'." *mysql-client-info*)))
+
+  )