Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 13f18fc226bcad92aeb359b1e5e6694fefdd6f7c..244f08e3ed61ebaf9571e7ab5ab3ae6f8515d850 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -447,9 +447,11 @@ ZEND_MODULE_STARTUP_D(mysql)
        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 @@ ZEND_MODULE_STARTUP_D(mysql)
 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 @@ PHP_MSHUTDOWN_FUNCTION(mysql)
 #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_MSHUTDOWN_FUNCTION(mysql)
  */
 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_RINIT_FUNCTION(mysql)
  */
 PHP_RSHUTDOWN_FUNCTION(mysql)
 {
-#if !defined(HAVE_MYSQLND) && defined(ZTS)
+#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
        mysql_thread_end();
 #endif