From f913d0b5c95b45c8bad01ad6703ddb01e83a0030 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 16 Apr 2003 21:50:01 +0000 Subject: [PATCH] r4521: Auto commit for Debian build --- db-mysql/mysql-sql.lisp | 18 +++++++++--------- debian/changelog | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/db-mysql/mysql-sql.lisp b/db-mysql/mysql-sql.lisp index 78f38ae..5f834ea 100644 --- a/db-mysql/mysql-sql.lisp +++ b/db-mysql/mysql-sql.lisp @@ -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 @@ -149,20 +149,20 @@ (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 diff --git a/debian/changelog b/debian/changelog index b345bf0..31ba861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (1.4.4-1) unstable; urgency=low + + * Move unwind-protect mysql backend + + -- Kevin M. Rosenberg Wed, 16 Apr 2003 15:49:46 -0600 + cl-sql (1.4.3-1) unstable; urgency=low * Rebuild against new libmysql package -- 2.34.1