diff options
| author | Michael Wallner <mike@php.net> | 2006-06-01 19:14:48 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2006-06-01 19:14:48 +0000 |
| commit | 6e2ff39e3ec0a909574de457a6f54230d3280bee (patch) | |
| tree | 204da798f098d1cfec480c973d25493792432ed7 /ext/mysql | |
| parent | 57cdfc58d22dbc4eb67970a214e1d029f0f4fcac (diff) | |
| download | php-git-6e2ff39e3ec0a909574de457a6f54230d3280bee.tar.gz | |
- Fix bug #37630: MySQL extensions should link against thread safe client libs if built with ZTS
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/config.m4 | 6 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 3e8bbdfb20..5870be02e1 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -86,7 +86,11 @@ if test "$PHP_MYSQL" != "no"; then Note that the MySQL client library is not bundled anymore!]) fi - MYSQL_LIBNAME=mysqlclient + if test "$enable_maintainer_zts" = "yes"; then + MYSQL_LIBNAME=mysqlclient_r + else + MYSQL_LIBNAME=mysqlclient + fi case $host_alias in *netware*[)] MYSQL_LIBNAME=mysql diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index bef974313b..023a87e9fb 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -392,13 +392,6 @@ ZEND_MODULE_STARTUP_D(mysql) REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); - -#ifdef ZTS -# if MYSQL_VERSION_ID >= 40000 - mysql_thread_init(); -# endif -#endif - return SUCCESS; } /* }}} */ @@ -407,12 +400,6 @@ ZEND_MODULE_STARTUP_D(mysql) */ PHP_MSHUTDOWN_FUNCTION(mysql) { -#ifdef ZTS -# if MYSQL_VERSION_ID >= 40000 - mysql_thread_end(); -# endif -#endif - UNREGISTER_INI_ENTRIES(); return SUCCESS; } |