r9168: fix transaction detection

diff --git a/ChangeLog b/ChangeLog
index b94e0db37ead5a2a2a8d1b12c7d2662057684117..647f6b54f76a04091bc89ef74665cc9a20bf2b60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+27 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.9.5
+       * db-mysql/mysql-sql.lisp: Fix bug in transaction capability
+       detection
+

 24 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.9.4: Multiple changes to support Allegro's "modern"
        lisp which uses a lowercase reader and has case-sensitive symbols
 24 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.9.4: Multiple changes to support Allegro's "modern"
        lisp which uses a lowercase reader and has case-sensitive symbols

diff --git a/TODO b/TODO
index 9e3d694ba3317d08123a3165f138f142fe65242c..a648df17ccdab28fde7907f956a10aa5fe9863f6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,13 +2,12 @@ GENERAL
 
 * test on mcl. SCL no longer affordable to individuals;
 * implement remaining functions for CLSQL AODBC backend;
 
 * test on mcl. SCL no longer affordable to individuals;
 * implement remaining functions for CLSQL AODBC backend;

-* port Oracle and ODBC backend to UFFI.
+* port Oracle backend to UFFI.

 
 COMMONSQL SPEC
 
 * Missing: 
 
 
 COMMONSQL SPEC
 
 * Missing: 
 

-  RECONNECT 

   CACHE-TABLE-QUERIES 
   *CACHE-TABLE-QUERIES-DEFAULT*
   *DEFAULT-UPDATE-OBJECTS-MAX-LEN* 
   CACHE-TABLE-QUERIES 
   *CACHE-TABLE-QUERIES-DEFAULT*
   *DEFAULT-UPDATE-OBJECTS-MAX-LEN* 

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 8c2488364e9d4821ede1d19dd331b714026438a4..074f24eb4a3043b1319c5ad84f3434dd6ec6a313 100644 (file)
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -437,8 +437,8 @@
   nil)
 
 (defmethod db-type-transaction-capable? ((db-type (eql :mysql)) database)
   nil)
 
 (defmethod db-type-transaction-capable? ((db-type (eql :mysql)) database)

-  (let ((has-innodb (caar (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto))))
-    (and has-innodb (string-equal "YES" has-innodb))))
+  (let ((tuple (car (database-query "SHOW VARIABLES LIKE 'HAVE_INNODB'" database :auto))))
+    (and tuple (string-equal "YES" (second tuple)))))

 
 (when (clsql-base-sys:database-type-library-loaded :mysql)
   (clsql-base-sys:initialize-database-type :database-type :mysql))
 
 (when (clsql-base-sys:database-type-library-loaded :mysql)
   (clsql-base-sys:initialize-database-type :database-type :mysql))

diff --git a/debian/changelog b/debian/changelog
index 697febb0878cced0a5d0b6f40fa89771c3c6c199..e5c1e712ee49842f20a15aed2beb64d4a5a78aa6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.9.5-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 27 Apr 2004 15:40:18 -0600
+

 cl-sql (2.9.4-2) unstable; urgency=low
 
   * Change depends to libmysqlclient-dev (closes:246039) 
 cl-sql (2.9.4-2) unstable; urgency=low
 
   * Change depends to libmysqlclient-dev (closes:246039)