X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=aa903222a62627e7294e4e3a74819752c4f67826;hb=f10c3dcbe75b5532d6646e24ecd25f5651a0c3a9;hp=354e61e771184483c005f68b7707f5e3147ecd32;hpb=a1921eaa3bd9a412a736a36bdd50ff5766ab1c9f;p=clsql.git diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index 354e61e..aa90322 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -18,12 +18,8 @@ (in-package #:mysql) -(defparameter *clsql-mysql-library-candidate-names* - (list #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64" - :directory (pathname-directory *load-truename*)) - #+(or 64bit x86-64) "clsql_mysql64" - (make-pathname :name "clsql_mysql" - :directory (pathname-directory *load-truename*)) +(defparameter *clsql-mysql-library-candidate-names* + (list #+(or 64bit x86-64) "clsql_mysql64" "clsql_mysql")) (defvar *mysql-library-candidate-names* @@ -39,13 +35,13 @@ set to the right path before compiling or loading the system.") (defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql))) *mysql-library-loaded*) - + (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql))) (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names* - :module "mysql" + :module "mysql" :supporting-libraries *mysql-supporting-libraries*) (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names* - :module "clsql-mysql" + :module "clsql-mysql" :supporting-libraries *mysql-supporting-libraries*) (setq *mysql-library-loaded* t))