r1705: *** empty log message ***

diff --git a/VERSION b/VERSION
index 48aed105721f87516340b181d27b34e492c13311..df0949845c69561865790369325cd3871a966c84 100644 (file)
--- 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 82040878abcf6b3769d7415c1f7db8b1c78bab3d..eddd6cde90cea23eff226b947d1cf6a37baa0aca 100644 (file)
--- 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 0d1c05fa24fddce2ba8a093a210b9c4a682b9471..7bd3bb9a0560a49512fe0896f0c0621932e51899 100644 (file)
--- 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)