From: Andrey Hristov <andrey@php.net>
Date: Sat, 8 Mar 2008 14:59:37 +0000 (+0000)
Subject: Fix introduced in 5.0.46, not in 5.0.42
X-Git-Tag: php-5.2.6RC3~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecf84f8b6b24b5b710d535bfcdeb063ef0171f19;p=php

Fix introduced in 5.0.46, not in 5.0.42
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 68082b2131..6184d44260 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -419,7 +419,7 @@ PHP_MSHUTDOWN_FUNCTION(mysql)
 #ifdef PHP_WIN32
 	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) {
+	if ((client_ver >= 50046 && client_ver < 50100) || client_ver > 50122) {
 		mysql_server_end();
 	}
 #else
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index bb5ca52107..3280ff832d 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -669,7 +669,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
 #ifdef PHP_WIN32
 	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) {
+	if ((client_ver >= 50046 && client_ver < 50100) || client_ver > 50122) {
 		mysql_server_end();
 	}
 #else