r9178: add mysql client 4.1 version detection

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

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index e5f377fe371150db8a7e566cd0017a29116f2af9..675014f50c1f8734b2ef7373939c07fabbe02c56 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.lisp,v 1.10 2003/05/17 07:02:00 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :mysql)
+(in-package #:mysql)
 
 ;;;; Modified by Kevin Rosenberg 
 ;;;;  - probe potential directories to find library
@@ -27,7 +26,7 @@
 
 (defparameter *clsql-mysql-library-path* 
   (uffi:find-foreign-library
-   "clsql-mysql"
+   "mysql"
    `(,(make-pathname :directory (pathname-directory *load-truename*))
      "/usr/lib/clsql/"
      "/sw/lib/clsql/"
@@ -41,8 +40,9 @@
       "/usr/lib/"
       "/sw/lib/"
       "/usr/local/lib/"
-      "/home/kevin/debian/src/clsql/db-mysql/"
-      "/mysql/lib/opt/")
+       "/home/kevin/debian/src/clsql/db-mysql/"
+       "/mysql/lib/dll32/"
+       "/mysql/lib/opt/")
    :drive-letters '("C")))
   
 (defvar *mysql-library-candidate-names*