mike Thu Jun 1 19:15:31 2006 UTC
Modified files:
/php-src/ext/mysql config.m4 php_mysql.c
/php-src/ext/mysqli config.m4
Log:
MFB: #37630 MySQL extensions should link against thread safe client libs if
built with ZTS
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysql/config.m4?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.67 php-src/ext/mysql/config.m4:1.68
--- php-src/ext/mysql/config.m4:1.67 Thu Jun 30 14:15:51 2005
+++ php-src/ext/mysql/config.m4 Thu Jun 1 19:15:31 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.67 2005/06/30 14:15:51 sniper Exp $
+dnl $Id: config.m4,v 1.68 2006/06/01 19:15:31 mike Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -86,7 +86,11 @@
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
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysql/php_mysql.c?r1=1.221&r2=1.222&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.221 php-src/ext/mysql/php_mysql.c:1.222
--- php-src/ext/mysql/php_mysql.c:1.221 Wed Mar 8 00:43:28 2006
+++ php-src/ext/mysql/php_mysql.c Thu Jun 1 19:15:31 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.221 2006/03/08 00:43:28 pajoye Exp $ */
+/* $Id: php_mysql.c,v 1.222 2006/06/01 19:15:31 mike Exp $ */
/* TODO:
*
@@ -385,13 +385,6 @@
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;
}
/* }}} */
@@ -400,12 +393,6 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysql)
{
-#ifdef ZTS
-# if MYSQL_VERSION_ID >= 40000
- mysql_thread_end();
-# endif
-#endif
-
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/config.m4?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.23 php-src/ext/mysqli/config.m4:1.24
--- php-src/ext/mysqli/config.m4:1.23 Tue Nov 29 21:31:35 2005
+++ php-src/ext/mysqli/config.m4 Thu Jun 1 19:15:31 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.23 2005/11/29 21:31:35 sniper Exp $
+dnl $Id: config.m4,v 1.24 2006/06/01 19:15:31 mike Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -22,9 +22,13 @@
MYSQL_CONFIG=$PHP_MYSQLI
fi
+ MYSQL_LIB_NAME='mysqlclient'
if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
MYSQL_LIB_CFG='--libmysqld-libs'
+ elif test "$enable_maintainer_zts" = "yes"; then
+ MYSQL_LIB_CFG='--libs_r'
+ MYSQL_LIB_NAME='mysqlclient_r'
else
MYSQL_LIB_CFG='--libs'
fi
@@ -40,12 +44,12 @@
dnl
dnl Check the library
dnl
- PHP_CHECK_LIBRARY(mysqlclient, mysql_set_server_option,
+ PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_server_option,
[
PHP_EVAL_INCLINE($MYSQLI_INCLINE)
PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
AC_DEFINE(HAVE_MYSQLILIB,1,[ ])
- PHP_CHECK_LIBRARY(mysqlclient, mysql_stmt_field_count,
+ PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_stmt_field_count,
[ ],[
AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.3 (for
MySQL 4.1.x) and < 5.0.1 for (MySQL 5.0.x) anymore. Please update your
libraries.])
],[$MYSQLI_LIBLINE])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
