X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=7434670da5a235391e45b2e3d2ed5506c7710bfe;hb=a4c3ffc118afeed0a5885d84b20d7e000eebcb06;hp=fcc31e6479be2ac95314c826dc69443aa6458cf3;hpb=5829838b970346a58f75683ecba005007414edb9;p=clsql.git

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index fcc31e6..7434670 100644
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.5 2002/04/06 22:27:41 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
 ;;;;
@@ -27,8 +27,8 @@
 
 (defvar *clsql-mysql-library-filename* 
     (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;mysql;clsql-mysql.so"
-     #+(or mswindows win32) "CLSQL: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*
@@ -71,12 +71,12 @@ set to the right path before compiling or loading the system.")
 				    *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
-	 ;; zlib required to load mysql on CMUCL Solaris
-	 (uffi:load-foreign-library 
-	  (uffi:find-foreign-library '("libz" "zlib")
-				     '("/usr/lib/" "/usr/local/" "/lib/")))
 	 (uffi:load-foreign-library mysql-path
 				    :module "mysql" 
 				    :supporting-libraries 
@@ -89,5 +89,7 @@ set to the right path before compiling or loading the system.")
 
 
 (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*))