projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2039: Debian build
[clsql.git]
/
interfaces
/
mysql
/
mysql-loader.cl
diff --git
a/interfaces/mysql/mysql-loader.cl
b/interfaces/mysql/mysql-loader.cl
index d12faddb751623f8e32e0d69d325ee00d201fbb6..7434670da5a235391e45b2e3d2ed5506c7710bfe 100644
(file)
--- a/
interfaces/mysql/mysql-loader.cl
+++ b/
interfaces/mysql/mysql-loader.cl
@@
-7,7
+7,7
@@
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: mysql-loader.cl,v 1.
4 2002/04/01 05:27:55
kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.
8 2002/05/13 22:05:21
kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-27,8
+27,8
@@
(defvar *clsql-mysql-library-filename*
(translate-logical-pathname
(defvar *clsql-mysql-library-filename*
(translate-logical-pathname
- #+(or linux unix) "CL
SQL:
interfaces;mysql;clsql-mysql.so"
- #+(or mswindows win32) "CL
SQL:
interfaces;mysql;clsql-mysql.dll"
+ #+(or linux unix) "CL
-LIBRARY:clsql;
interfaces;mysql;clsql-mysql.so"
+ #+(or mswindows win32) "CL
-LIBRARY:clsql;
interfaces;mysql;clsql-mysql.dll"
))
(defvar *mysql-library-filename*
))
(defvar *mysql-library-filename*
@@
-71,6
+71,10
@@
set to the right path before compiling or loading the system.")
*mysql-library-candidate-directories*
:drive-letters
*mysql-library-candidate-drive-letters*)))
*mysql-library-candidate-directories*
:drive-letters
*mysql-library-candidate-drive-letters*)))
+ ;; zlib required to load mysql on CMUCL Solaris
+ (uffi:load-foreign-library
+ (uffi:find-foreign-library '("libz" "zlib")
+ '("/usr/lib/" "/usr/local/" "/lib/")))
(when
(and
(uffi:load-foreign-library mysql-path
(when
(and
(uffi:load-foreign-library mysql-path
@@
-85,5
+89,7
@@
set to the right path before compiling or loading the system.")
(clsql-sys:database-type-load-foreign :mysql)
(clsql-sys:database-type-load-foreign :mysql)
-
-
+(when (clsql-sys:database-type-library-loaded :mysql)
+ (clsql-sys:initialize-database-type :database-type :mysql)
+ (setq clsql:*default-database-type* :mysql)
+ (pushnew :mysql cl:*features*))