MFH: 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 0e8f3caa4d9d100e284ee92678a12410f1c7ee22..50439d94da43c2a70e8a9a2b41ff5218f5eb5b86 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -401,9 +401,11 @@ 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); 
 
+#if MYSQL_VERSION_ID >= 40000
        if (mysql_server_init(0, NULL, NULL)) {
                return FAILURE;
        }
+#endif
 
        return SUCCESS;
 }
@@ -413,14 +415,16 @@ ZEND_MODULE_STARTUP_D(mysql)
  */
 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();
        }
 #else
        mysql_server_end();
+#endif
 #endif
 
        UNREGISTER_INI_ENTRIES();
@@ -432,7 +436,7 @@ PHP_MSHUTDOWN_FUNCTION(mysql)
  */
 PHP_RINIT_FUNCTION(mysql)
 {
-#ifdef ZTS
+#if defined(ZTS) && MYSQL_VERSION_ID >= 40000
        if (mysql_thread_init()) {
                return FAILURE;
        }
@@ -452,7 +456,7 @@ PHP_RINIT_FUNCTION(mysql)
  */
 PHP_RSHUTDOWN_FUNCTION(mysql)
 {
-#ifdef ZTS
+#if defined(ZTS) && MYSQL_VERSION_ID >= 40000
        mysql_thread_end();
 #endif