scottmac Sun Sep 9 16:08:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.15&r2=1.213.2.6.2.16&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.15
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.15 Mon Jun 25 16:01:30 2007
+++ php-src/ext/mysql/php_mysql.c Sun Sep 9 16:08:17 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.15 2007/06/25 16:01:30 scottmac Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16 2007/09/09 16:08:17 scottmac Exp $ */
/* TODO:
*
@@ -401,9 +401,11 @@
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);
+#if MYSQL_VERSION_ID >= 40000
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
}
+#endif
return SUCCESS;
}
@@ -413,8 +415,9 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysql)
{
+#if MYSQL_VERSION_ID >= 40000
#ifdef PHP_WIN32
- unsigned long client_ver = mysql_get_client_version;
+ unsigned long client_ver = mysql_get_client_version();
/* Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows */
if ((client_ver > 50042 && client_ver < 50100) || client_ver > 50122) {
mysql_server_end();
@@ -422,6 +425,7 @@
#else
mysql_server_end();
#endif
+#endif
UNREGISTER_INI_ENTRIES();
return SUCCESS;
@@ -432,7 +436,7 @@
*/
PHP_RINIT_FUNCTION(mysql)
{
-#ifdef ZTS
+#if defined(ZTS) && MYSQL_VERSION_ID >= 40000
if (mysql_thread_init()) {
return FAILURE;
}
@@ -452,7 +456,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
-#ifdef ZTS
+#if defined(ZTS) && MYSQL_VERSION_ID >= 40000
mysql_thread_end();
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
