From 9d6ec50020109467ff766ad753a4194ee756b1b9 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 16 Jul 2007 08:15:23 +0000 Subject: [PATCH] r11753: 15 Jul 2007 Kevin Rosenberg * 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 --- ChangeLog | 7 +++++++ db-mysql/mysql-loader.lisp | 9 +++------ debian/control | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09e1d09..22d13c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +15 Jul 2007 Kevin Rosenberg + * 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 * 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 0267343..43189cf 100644 --- 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 9bb259a..6b2f496 100644 --- 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 -- 2.34.1