X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=ce8b7ceeb3dec44d87b68e65bc2968f739f2a983;hp=df0bd643915574b513f550d30a7fc40e3802475c;hb=9a78eef71c902d3b272fb7c777bff6dd0acd8a2b;hpb=b06cb6d32e2a334f7dc72e8fb583a5b9609136b7 diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl index df0bd64..ce8b7ce 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.1 2002/03/23 14:04:52 kevin Exp $ +;;;; $Id: mysql-loader.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -51,17 +51,24 @@ load the MySQL client library succesfully. If this differs at your site, 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") - +(defmethod database-type-library-loaded ((database-type (eql :mysql))) + *mysql-library-loaded*) + (defmethod database-type-load-foreign ((database-type (eql :mysql))) - (uffi:load-foreign-library *mysql-library-filename* - :module "mysql" - :supporting-libraries - *mysql-supporting-libraries*) - (uffi:load-foreign-library *clsql-mysql-library-filename* - :module "clsql-mysql" - :supporting-libraries - (append *mysql-supporting-libraries*))) + (when + (and + (uffi:load-foreign-library *mysql-library-filename* + :module "mysql" + :supporting-libraries + *mysql-supporting-libraries*) + (uffi:load-foreign-library *clsql-mysql-library-filename* + :module "clsql-mysql" + :supporting-libraries + (append *mysql-supporting-libraries*))) + (setq *mysql-library-loaded* t))) (database-type-load-foreign :mysql)