From eb6238bfcd8e0359c813c24626cc0b435c7a04bf Mon Sep 17 00:00:00 2001 From: Russ Tyndall Date: Wed, 25 Feb 2015 08:59:32 -0500 Subject: [PATCH] Changed type declarations in mysql-sql/database-query an invalid type warning seemed to be generating a compilation failure From Zach Beane (thanks) --- ChangeLog | 7 +++++++ db-mysql/mysql-sql.lisp | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8387aa..5c3162f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-02-24 Russ Tyndall + * 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 * 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 95ec0ec..1f54d44 100644 --- 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 -- 2.34.1