1 diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp
2 --- clsql/db-mysql/mysql-loader.lisp 2005-06-08 18:23:40.000000000 -0600
3 +++ clsql-debian/db-mysql/mysql-loader.lisp 2005-06-08 18:17:29.000000000 -0600
6 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
7 (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
9 - :supporting-libraries *mysql-supporting-libraries*)
10 - (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
11 - :module "clsql-mysql"
12 - :supporting-libraries *mysql-supporting-libraries*)
13 - (setq *mysql-library-loaded* t))
15 + :supporting-libraries *mysql-supporting-libraries*)
16 + (if (probe-file #p"/usr/lib/clsql/clsql_mysql.so")
17 + (uffi:load-foreign-library #p"/usr/lib/clsql/clsql_mysql.so")
18 + (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
19 + :module "clsql-mysql"
20 + :supporting-libraries *mysql-supporting-libraries*))
21 + (setq *mysql-library-loaded* t))
24 (clsql-sys:database-type-load-foreign :mysql)
25 diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.lisp
26 --- clsql/uffi/clsql-uffi-loader.lisp 2005-06-08 13:38:14.000000000 -0600
27 +++ clsql-debian/uffi/clsql-uffi-loader.lisp 2005-06-08 18:30:27.000000000 -0600
29 "T if foreign library was able to be loaded successfully")
31 (defun load-uffi-foreign-library ()
32 - (find-and-load-foreign-library *clsql-uffi-library-filenames*
33 - :module "clsql-uffi"
34 - :supporting-libraries
35 - *clsql-uffi-supporting-libraries*)
36 + (if (probe-file #p"/usr/lib/clsql/clsql_uffi.so")
37 + (uffi:load-foreign-library #p"/usr/lib/clsql/clsql_uffi.so")
38 + (find-and-load-foreign-library *clsql-uffi-library-filenames*
39 + :module "clsql-uffi"
40 + :supporting-libraries
41 + *clsql-uffi-supporting-libraries*))
42 (setq *uffi-library-loaded* t))
44 (load-uffi-foreign-library)