projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9569: `head -6 ChangeLog`
[clsql.git]
/
db-mysql
/
mysql-loader.lisp
diff --git
a/db-mysql/mysql-loader.lisp
b/db-mysql/mysql-loader.lisp
index 40ae8f6f96e95dd1c7886a554a7b606d1c171ae8..f61223a503e7a94c0e8879f8895eac553f53cb4d 100644
(file)
--- a/
db-mysql/mysql-loader.lisp
+++ b/
db-mysql/mysql-loader.lisp
@@
-2,14
+2,14
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name:
mysql-loader.sql
-;;;; Purpose:
MySQL library loader using UFFI
-;;;;
Programmers
: Kevin M. Rosenberg
-;;;;
Date Star
ted: Feb 2002
+;;;; Name: mysql-loader.sql
+;;;; Purpose: MySQL library loader using UFFI
+;;;;
Author
: Kevin M. Rosenberg
+;;;;
Crea
ted: Feb 2002
;;;;
;;;; $Id$
;;;;
;;;;
;;;; $Id$
;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; 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
;;;; 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
@@
-18,30
+18,25
@@
(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"
- `(,
(make-pathname :directory (pathname-directory *load-truename*))
+ `(,
clsql-mysql-system::*library-file-dir*
"/usr/lib/clsql/"
"/usr/lib/clsql/"
- "/sw/lib/clsql/"
- "/home/kevin/debian/src/clsql/db-mysql/")
+ "/sw/lib/clsql/")
:drive-letters '("C")))
(defparameter *libz-library-path*
(uffi:find-foreign-library
:drive-letters '("C")))
(defparameter *libz-library-path*
(uffi:find-foreign-library
- '("libz" "zlib")
+ '("libz" "zlib
wapi" "zlib
")
`(,(make-pathname :directory (pathname-directory *load-truename*))
`(,(make-pathname :directory (pathname-directory *load-truename*))
- "/usr/lib/"
- "/sw/lib/"
- "/usr/local/lib/"
- "/home/kevin/debian/src/clsql/db-mysql/"
- "/mysql/lib/opt/")
+ #+64bit "/usr/lib64/"
+ "/usr/lib/"
+ "/sw/lib/"
+ "/usr/local/lib/"
+ "/bin/"
+ "/mysql/lib/dll32/"
+ "/mysql/lib/opt/")
:drive-letters '("C")))
(defvar *mysql-library-candidate-names*
:drive-letters '("C")))
(defvar *mysql-library-candidate-names*
@@
-49,7
+44,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"))
@@
-61,10
+58,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*
@@
-84,5
+81,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)