r8811: add support for usql backend, integrate Marcus Pearce <ek735@soi.city.ac.uk...

[clsql.git] / db-mysql / mysql-api.lisp

diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp
index cff8da4a98dd9a175d8c6eac7c6ab2689f30b027..7170fda066b72a29f480c80e0dc04422eecb5c1f 100644 (file)
--- a/db-mysql/mysql-api.lisp
+++ b/db-mysql/mysql-api.lisp
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-api.lisp,v 1.6 2003/07/21 01:45:45 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -106,10 +106,6 @@
      (:var-string 253)
      (:string 254)))
 
-#-(or mysql-client-v3 mysql-client-v4)
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (pushnew :mysql-client-v3 cl:*features*))
-
 #+mysql-client-v3
 (uffi:def-struct mysql-field
     (name (* :char))
@@ -251,7 +247,9 @@
   :module "mysql" 
   :returning (* mysql-mysql))
 
+#-mysql-client-v4
 (declaim (inline mysql-connect))
+#-mysql-client-v4
 (uffi:def-function "mysql_connect"
     ((mysql (* mysql-mysql))
      (host :cstring)
@@ -262,7 +260,7 @@
 
 ;; Need to comment this out for LW 4.2.6
 ;; ? bug in LW version
-;;(declaim (inline mysql-real-connect))
+#-lispworks (declaim (inline mysql-real-connect))
 (uffi:def-function "mysql_real_connect"
     ((mysql (* mysql-mysql))
      (host :cstring)
@@ -306,14 +304,18 @@
   :module "mysql"
   :returning :int)
 
+#-mysql-client-v4
 (declaim (inline mysql-create-db))
+#-mysql-client-v4
 (uffi:def-function "mysql_create_db"
   ((mysql (* mysql-mysql))
    (db :cstring))
   :module "mysql"
   :returning :int)
 
+#-mysql-client-v4
 (declaim (inline mysql-drop-db))
+#-mysql-client-v4
 (uffi:def-function "mysql_drop_db"
     ((mysql (* mysql-mysql))
      (db :cstring))
@@ -364,12 +366,6 @@
   :module "mysql"
   :returning :cstring)
 
-(declaim (inline mysql-get-client-info))
-(uffi:def-function "mysql_get_client_info"
-    ()
-  :module "mysql"
-  :returning :cstring)
-
 (declaim (inline mysql-get-host-info))
 (uffi:def-function "mysql_get_host_info"
     ((mysql (* mysql-mysql)))