projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Depend on UFFI version 2.x
[clsql.git]
/
db-mysql
/
mysql-loader.lisp
diff --git
a/db-mysql/mysql-loader.lisp
b/db-mysql/mysql-loader.lisp
index 43189cfed66138189cd4356feb1e48218ccf37b9..afea3e5415359a5dd155b1ff1a86c95c0335d050 100644
(file)
--- a/
db-mysql/mysql-loader.lisp
+++ b/
db-mysql/mysql-loader.lisp
@@
-7,9
+7,7
@@
;;;; Author: Kevin M. Rosenberg
;;;; Created: Feb 2002
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Created: Feb 2002
;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@
-38,18
+36,16
@@
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)))
*mysql-library-loaded*)
(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
- (clsql:push-library-path
- (make-pathname :directory clsql-mysql-system::*library-file-dir*))
-
- (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
- :module "mysql"
- :supporting-libraries *mysql-supporting-libraries*)
+ (unless *mysql-library-loaded*
+ (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
- (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
- :module "clsql-mysql"
- :supporting-libraries *mysql-supporting-libraries*)
- (setq *mysql-library-loaded* t))
+ (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*)
+ (setq *mysql-library-loaded* t)))
(clsql-sys:database-type-load-foreign :mysql)
(clsql-sys:database-type-load-foreign :mysql)
-