From 1ec37492dedf271a4a05b0e852693319e573b898 Mon Sep 17 00:00:00 2001 From: Nathan Bird Date: Tue, 24 Apr 2012 10:57:42 -0400 Subject: [PATCH] Revert "If running on a threaded lisp try loading libmysqlclient_r" This reverts commit 7127589ca079f4f4279be601ebd272b7488906b4. While I think this might be right, I've not gotten a chance to test this at all. Aside from that, on my system (ubuntu 12.04 x86_64) both versions symlink to the same shared object. --- ChangeLog | 7 ------- db-mysql/mysql-loader.lisp | 7 +------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97264eb..8ee52db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,13 +23,6 @@ ODBC connection specs, and added example code connecting to ODBC databases. -2012-02-22 Nathan Bird - - * db-mysql/mysql-loader.lisp (*mysql-library-candidate-names*): If - running on a threaded lisp try loading libmysqlclient_r (the - threaded build) first. from - http://dev.mysql.com/doc/refman/5.1/en/threaded-clients.html - 2012-01-05 Nathan Bird * db-odbc/odbc-dbi.lisp: handle sql decimal type in the same way diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index cb75e5e..afea3e5 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -22,12 +22,7 @@ "clsql_mysql")) (defvar *mysql-library-candidate-names* - '( - #+(or allegro cmu lispworks openmcl sb-thread scl) "libmysqlclient_r" - "libmysqlclient" - "libmysql")) - - + '("libmysqlclient" "libmysql")) (defvar *mysql-supporting-libraries* '("c") "Used only by CMU. List of library flags needed to be passed to ld to -- 2.34.1