r4521: Auto commit for Debian build
authorKevin M. Rosenberg <kevin@rosenberg.net>
Wed, 16 Apr 2003 21:50:01 +0000 (21:50 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Wed, 16 Apr 2003 21:50:01 +0000 (21:50 +0000)
db-mysql/mysql-sql.lisp
debian/changelog

index 78f38ae9c354af835ae13a00ab788dee61e8bd17..5f834ea7c23fb8df733cce70fe231fe6b431a6e9 100644 (file)
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-sql.lisp,v 1.3 2002/10/14 07:10:19 kevin Exp $
+;;;; $Id: mysql-sql.lisp,v 1.4 2003/04/16 21:50:01 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
        (if (zerop (mysql-query mysql-ptr query-native))
           (let ((res-ptr (mysql-use-result mysql-ptr)))
             (if res-ptr
-                (let ((num-fields (mysql-num-fields res-ptr)))
-                  (setq types (canonicalize-types 
-                                     types num-fields
-                                     res-ptr))
-                  (unwind-protect
-                      (loop for row = (mysql-fetch-row res-ptr)
+                (unwind-protect
+                     (let ((num-fields (mysql-num-fields res-ptr)))
+                       (setq types (canonicalize-types 
+                                    types num-fields
+                                    res-ptr))
+                       (loop for row = (mysql-fetch-row res-ptr)
                              until (uffi:null-pointer-p row)
                              collect
                              (loop for i from 0 below num-fields
                                    collect
                                    (convert-raw-field
                                     (uffi:deref-array row '(:array (* :unsigned-char)) i)
-                                    types i)))
-                    (mysql-free-result res-ptr)))
+                                    types i))))
+                  (mysql-free-result res-ptr))
               (error 'clsql-sql-error
                      :database database
                      :expression query-expression
index b345bf0c51d6b96aad748233628f36a6586d2cf6..31ba8611f716427a8c2da83c7514ac92d95dd497 100644 (file)
@@ -1,3 +1,9 @@
+cl-sql (1.4.4-1) unstable; urgency=low
+
+  * Move unwind-protect mysql backend
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 16 Apr 2003 15:49:46 -0600
+
 cl-sql (1.4.3-1) unstable; urgency=low
 
   * Rebuild against new libmysql package