scottmac Sun Sep 9 16:07:45 2007 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
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.240&r2=1.241&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.240 php-src/ext/mysql/php_mysql.c:1.241
--- php-src/ext/mysql/php_mysql.c:1.240 Mon Aug 6 15:11:46 2007
+++ php-src/ext/mysql/php_mysql.c Sun Sep 9 16:07:45 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.240 2007/08/06 15:11:46 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.241 2007/09/09 16:07:45 scottmac Exp $ */
/* TODO:
*
@@ -447,9 +447,11 @@
REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE",
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
#ifndef HAVE_MYSQLND
+#if MYSQL_VERSION_ID >= 40000
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
}
+#endif
#else
mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();
@@ -464,8 +466,9 @@
PHP_MSHUTDOWN_FUNCTION(mysql)
{
#ifndef HAVE_MYSQLND
+#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();
@@ -473,6 +476,7 @@
#else
mysql_server_end();
#endif
+#endif
#else
mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache);
mysqlnd_qcache_free_cache_reference(&mysql_mysqlnd_qcache);
@@ -487,7 +491,7 @@
*/
PHP_RINIT_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS)
+#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
if (mysql_thread_init()) {
return FAILURE;
}
@@ -511,7 +515,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS)
+#if !defined(HAVE_MYSQLND) && 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
