r11753: 15 Jul 2007 Kevin Rosenberg <kevin@rosenberg.net>

        * Version 3.8.5
        * db-mysql/mysql-loader.lisp: Revert previous change since libmysql is
        not dynamically loaded on Windows
        * debian/control: Add libmysqlclient15-dev as dependency for cl-sql-mysql
        since clsql-mysql modules depends on finding the .so files to load

diff --git a/ChangeLog b/ChangeLog
index 09e1d095a0ac7e8b3fd9226a124c08a5a6f20e06..22d13c3b77a4340f9a800585d0182cba031ee74f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+15 Jul 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 3.8.5
+       * db-mysql/mysql-loader.lisp: Revert previous change since libmysql is
+       not dynamically loaded on Windows
+       * debian/control: Add libmysqlclient15-dev as dependency for cl-sql-mysql
+       since clsql-mysql modules depends on finding the .so files to load
+       
 22 Jun 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.8.4
        * db-mysql/mysql-loader.lisp: Do not bother loading libmysqlclient since

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 0267343684e20c0e441ce595b0b01ac6eb776472..43189cfed66138189cd4356feb1e48218ccf37b9 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -41,12 +41,9 @@ set to the right path before compiling or loading the system.")
   (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-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"

diff --git a/debian/control b/debian/control
index 9bb259a3aac80dc8f023bf8d16a574600493cb0a..6b2f4969324d598f400e30c59de41e1625f53491 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Common UFFI functions for CLSQL database backends
 
 Package: cl-sql-mysql
 Architecture: any
-Depends: cl-sql (>= ${source:Version}), cl-sql-uffi (>= ${source:Version}), ${shlibs:Depends}
+Depends: cl-sql (>= ${source:Version}), cl-sql-uffi (>= ${source:Version}), ${shlibs:Depends}, libmysqlclient15-dev
 Provides: cl-sql-backend
 Description: CLSQL database backend, MySQL
  This package enables you to use the CLSQL data access package