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.

diff --git a/ChangeLog b/ChangeLog
index 97264eb113e34e5a564469b806b398d7dfb3560f..8ee52db960c452b94d9c841dc954eb45f0cb68ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,13 +23,6 @@
        ODBC connection specs, and added example code connecting to ODBC
        databases.
 
-2012-02-22  Nathan Bird  <nathan@acceleration.net>
-
-       * 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  <nathan@acceleration.net>
 
        * 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 cb75e5e5b3959db88f637aa4a94a2dcf499ce256..afea3e5415359a5dd155b1ff1a86c95c0335d050 100644 (file)
--- 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