Changed type declarations in mysql-sql/database-query

an invalid type warning seemed to be generating a compilation failure

From Zach Beane (thanks)

diff --git a/ChangeLog b/ChangeLog
index f8387aa4e971ff6bf22baf3cc1d3f494013fbb99..5c3162fde4180a84a69860bd8f9b5ae0ac0e29a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-24 Russ Tyndall <russ@acceleration.net>
+       * mysql-sql.lisp
+       an error in type declarations generating a compilation warning
+       was being treated as an error in recent SBCLs, fixed the type
+       warning by correcting the type (still a ton of compliation 
+       notes)
+
 2014-02-23 Russ Tyndall <russ@acceleration.net>
        * sql/metaclasses.lisp
        made reinitialize-instance return the instance passed to it as

diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp
index 95ec0eceb32f910dabf5c2cc96d6d6621de38abb..1f54d44c430e6f261a6f7a7e509c470e035b0f79 100644 (file)
--- a/db-mysql/mysql-sql.lisp
+++ b/db-mysql/mysql-sql.lisp
@@ -245,9 +245,11 @@
                           result-types field-names)
   (declare (optimize (speed 3)))
   (let ((mysql-ptr (database-mysql-ptr database))
-        (results nil)     ;; all the results and column-names in reverse-order
-        res-ptr (num-fields 0))
-    (declare (type mysql-mysql-ptr-def mysql-ptr res-ptr)
+        (results nil) ;; all the results and column-names in reverse-order
+        (res-ptr nil)
+        (num-fields 0))
+    (declare (type mysql-mysql-ptr-def mysql-ptr)
+             (type (or null mysql-mysql-res-ptr-def) res-ptr)
              (fixnum num-fields))
     (when (database-execute-command query-expression database)
       (labels