From 6cee91ae8461fd78454da4781c008398ad06abe2 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 27 Apr 2004 23:17:47 +0000 Subject: [PATCH] r9168: fix transaction detection --- ChangeLog | 5 +++++ TODO | 3 +-- db-mysql/mysql-sql.lisp | 4 ++-- debian/changelog | 6 ++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b94e0db..647f6b5 100644 --- 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 diff --git a/TODO b/TODO index 9e3d694..a648df1 100644 --- 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; -* port Oracle and ODBC backend to UFFI. +* port Oracle backend to UFFI. COMMONSQL SPEC * Missing: - RECONNECT 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 8c24883..074f24e 100644 --- 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) - (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)) diff --git a/debian/changelog b/debian/changelog index 697febb..e5c1e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.9.5-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Tue, 27 Apr 2004 15:40:18 -0600 + cl-sql (2.9.4-2) unstable; urgency=low * Change depends to libmysqlclient-dev (closes:246039) -- 2.34.1