X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=cdf28cd4f907725d54a18a2fc5b3e918a61cfbbf;hp=aa903222a62627e7294e4e3a74819752c4f67826;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=ba8e1b6858fbb883c69e6c09d37b1945878ccba3

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index aa90322..cdf28cd 100644
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -7,8 +7,6 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  Feb 2002
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -18,9 +16,10 @@
 
 (in-package #:mysql)
 
+;; searches clsql_mysql64 to accomodate both 32-bit and 64-bit libraries on same system
 (defparameter *clsql-mysql-library-candidate-names*
-  (list #+(or 64bit x86-64) "clsql_mysql64"
-        "clsql_mysql"))
+  `(,@(when (> most-positive-fixnum (expt 2 32)) (list "clsql_mysql64"))
+    "clsql_mysql"))
 
 (defvar *mysql-library-candidate-names*
   '("libmysqlclient" "libmysql"))
@@ -37,9 +36,12 @@ set to the right path before compiling or loading the system.")
   *mysql-library-loaded*)
 
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+  (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
+
   (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
                                             :module "mysql"
                                             :supporting-libraries *mysql-supporting-libraries*)
+
   (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
                                             :module "clsql-mysql"
                                             :supporting-libraries *mysql-supporting-libraries*)