From c31eca44f939816749f382f5a449bfee07eecf86 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 29 Mar 2002 14:03:53 +0000
Subject: [PATCH] r1705: *** empty log message ***

---
 VERSION                             |  3 ++-
 interfaces/clsql-uffi/clsql-uffi.cl | 12 ++++++++++--
 interfaces/mysql/mysql-sql.cl       |  9 +++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 48aed10..df09498 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,5 @@
-0.6.1
+0.6.2-pre
+
 
 
 
diff --git a/interfaces/clsql-uffi/clsql-uffi.cl b/interfaces/clsql-uffi/clsql-uffi.cl
index 8204087..eddd6cd 100644
--- a/interfaces/clsql-uffi/clsql-uffi.cl
+++ b/interfaces/clsql-uffi/clsql-uffi.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.cl,v 1.3 2002/03/29 09:51:20 kevin Exp $
+;;;; $Id: clsql-uffi.cl,v 1.4 2002/03/29 14:03:27 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,6 +44,14 @@
 		     :double)
 		    (t
 		     t)))
+		 (:int32
+		  (if (eq :int32 (nth i auto-list))
+		      :int32
+		    t))
+		 (:int64
+		  (if (eq :int64 (nth i auto-list))
+		      :int64
+		    t))
 		 (t
 		  t))
 	       new-types)))
@@ -82,7 +90,7 @@
     (case type
       (:double
        (atof char-ptr))
-      (:int32
+      ((or :int32 :int)
        (atoi char-ptr))
       (:int64
        (uffi:with-foreign-object (high32-ptr :int)
diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 0d1c05f..7bd3bb9 100644
--- a/interfaces/mysql/mysql-sql.cl
+++ b/interfaces/mysql/mysql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-sql.cl,v 1.16 2002/03/29 09:37:24 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.17 2002/03/29 14:03:27 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -72,12 +72,13 @@
       nil
       (let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
 	(cond
-	  ((listp types)
-	   (canonicalize-type-list types auto-list))
+	 ((listp types)
+	  (canonicalize-type-list types auto-list))
+	  types)
 	  ((eq types :auto)
 	   auto-list)
 	  (t
-	   nil)))))
+	   nil))))
 
 (defmethod database-initialize-database-type ((database-type (eql :mysql)))
   t)
-- 
2.34.1