r10179: 03 Dec 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * db-mysql/mysql-api.lisp: Commit patch from Paul Werkowski
        to fix structure name.
        * sql/database.lisp: More specific error message with trying
        to use a database value of NIL.

diff --git a/ChangeLog b/ChangeLog
index 276cb9d0a5cdbfbdc34571140e03bd9c90d31087..9f7a7f58b28a9977f810576d352a3d2d9bc30de5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+03 Dec 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * db-mysql/mysql-api.lisp: Commit patch from Paul Werkowski
+       to fix structure name.
+       * sql/database.lisp: More specific error message with trying
+       to use a database value of NIL.
+       
 11 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.1
        * sql/generic-postgresql.lisp: Commit patch from Chris Capel to

diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index 75ca09bb090c08982a9dfd6a3f9e0f0bc4136465..fb6bfbf8794aaca45307826dc47595bdd8c89956 100644 (file)
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -135,7 +135,7 @@
 #+mysql-client-v4.1
 (uffi:def-struct mysql-field
     (name (* :char))
-  (org_table (* :char))
+  (org_name (* :char))
   (table (* :char))
   (org_table (* :char))
   (db (* :char))

diff --git a/sql/database.lisp b/sql/database.lisp
index 706ccbf7cc1c323448a2c8732ddf8e4a2647d6a9..285d3e269b237e4d6817854465f7d01cfe78b035 100644 (file)
--- a/sql/database.lisp
+++ b/sql/database.lisp
@@ -63,7 +63,9 @@ error is signalled."
                    :message
                   (format nil "There exists ~A database called ~A."
                           (if (zerop count) "no" "more than one")
-                          database)))))))
+                          database)))))
+    (null
+     (error "A database must be specified rather than NIL."))))
 
 
 (defun connect (connection-spec