From: Scott MacVicar <scottmac@php.net>
Date: Sun, 9 Sep 2007 16:08:17 +0000 (+0000)
Subject: MFH: Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)
X-Git-Tag: php-5.2.5RC1~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734dfc8b753e5785e3d0654d297f8a508444cd21;p=php

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 0e8f3caa4d..50439d94da 100644
--- 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