Merge branch 'connection-pool-fix'

diff --git a/ChangeLog b/ChangeLog
index 1ea1380bd97fb525b7ecc0e5a336a83b48831f31..63b51ba0caa11445743f34dbf9a3f489c8b7c23d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
        * sql/pool.lisp: Check connections for validity before returning
        to the user.
 
+2010-03-01  Kevin Rosenberg <kevin@rosenberg.net>
+       * db-mysql/mysql-api.lisp: Remove spurious enumeration
+
 2010-02-16  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.0.4
        * db-mysql/mysql-api.lisp: Fix mysql_options UFFI parameter list

diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index 089c81220749881a79d75690829c127bcc8023ab..45328153b20bf356c3e33ef8c9f464cc5a011d32 100644 (file)
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -121,12 +121,6 @@
      :get-result
      :use-result))
 
-#+(or mysql-client-v4.1 mysql-client-v5)
-(uffi:def-enum mysql-field-types
-    (:ready
-     :get-result
-     :use-result))
-
 ;;; Opaque pointers to mysql C-defined structures
 (uffi:def-foreign-type mysql-mysql (* :void))
 (uffi:def-foreign-type mysql-mysql-res (* :void))