projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9407: add missing \#: to some test names
[clsql.git]
/
db-mysql
/
mysql-loader.lisp
diff --git
a/db-mysql/mysql-loader.lisp
b/db-mysql/mysql-loader.lisp
index 675014f50c1f8734b2ef7373939c07fabbe02c56..d93b783b88049bd7d26bbf278bea586f2f4166a6 100644
(file)
--- a/
db-mysql/mysql-loader.lisp
+++ b/
db-mysql/mysql-loader.lisp
@@
-18,12
+18,6
@@
(in-package #:mysql)
(in-package #:mysql)
-;;;; Modified by Kevin Rosenberg
-;;;; - probe potential directories to find library
-;;;; - Changed from CMUCL functions to UFFI to
-;;;; -- prevent library from being loaded multiple times
-;;;; -- support Allegro CL and Lispworks
-
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
"mysql"
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
"mysql"
@@
-37,6
+31,7
@@
(uffi:find-foreign-library
'("libz" "zlib")
`(,(make-pathname :directory (pathname-directory *load-truename*))
(uffi:find-foreign-library
'("libz" "zlib")
`(,(make-pathname :directory (pathname-directory *load-truename*))
+ #+64bit "/usr/lib64/"
"/usr/lib/"
"/sw/lib/"
"/usr/local/lib/"
"/usr/lib/"
"/sw/lib/"
"/usr/local/lib/"
@@
-50,7
+45,9
@@
(defparameter *mysql-library-candidate-directories*
`(,(pathname-directory *load-pathname*)
(defparameter *mysql-library-candidate-directories*
`(,(pathname-directory *load-pathname*)
- "/opt/mysql/lib/mysql/" "/usr/local/lib/" "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/"))
+ "/opt/mysql/lib/mysql/" "/usr/local/lib/"
+ #+64bit "/usr/lib64/"
+ "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/"))
(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
@@
-62,10
+59,10
@@
set to the right path before compiling or loading the system.")
(defvar *mysql-library-loaded* nil
"T if foreign library was able to be loaded successfully")
(defvar *mysql-library-loaded* nil
"T if foreign library was able to be loaded successfully")
-(defmethod clsql-
base-
sys:database-type-library-loaded ((database-type (eql :mysql)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql)))
*mysql-library-loaded*)
*mysql-library-loaded*)
-(defmethod clsql-
base-
sys:database-type-load-foreign ((database-type (eql :mysql)))
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
(let ((mysql-path
(uffi:find-foreign-library *mysql-library-candidate-names*
*mysql-library-candidate-directories*
(let ((mysql-path
(uffi:find-foreign-library *mysql-library-candidate-names*
*mysql-library-candidate-directories*
@@
-85,5
+82,5
@@
set to the right path before compiling or loading the system.")
(setq *mysql-library-loaded* t))
(setq *mysql-library-loaded* t))
-(clsql-
base-
sys:database-type-load-foreign :mysql)
+(clsql-sys:database-type-load-foreign :mysql)