X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=cdf28cd4f907725d54a18a2fc5b3e918a61cfbbf;hb=3d86a3b402ae495cddcc5999c5bdd7fe6f586d53;hp=0267343684e20c0e441ce595b0b01ac6eb776472;hpb=650466772f9eefbafd68fa66a4f5e5b4efd14c3a;p=clsql.git diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index 0267343..cdf28cd 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -7,8 +7,6 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Created: Feb 2002 ;;;; -;;;; $Id$ -;;;; ;;;; 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 @@ -38,15 +36,11 @@ 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))) - (clsql:push-library-path - (make-pathname :directory clsql-mysql-system::*library-file-dir*)) - - ;; since clsql-mysql is dynamically linked to libmysqlclient, do not need to - ;; load libmysqlclient directly - ;; - ;;(clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names* - ;; :module "mysql" - ;; :supporting-libraries *mysql-supporting-libraries*) + (clsql:push-library-path clsql-mysql-system::*library-file-dir*) + + (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"