From: Andrey Hristov <andrey@php.net>
Date: Sat, 8 Mar 2008 15:17:45 +0000 (+0000)
Subject: Bug fixed in MySQL 5.0.46
X-Git-Tag: RELEASE_2_0_0a1~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd9b7889ec4ef8d254b244ba819499809a3aa064;p=php

Bug fixed in MySQL 5.0.46
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index d1f334c7b1..5a41061f59 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -470,10 +470,10 @@ 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.
+	  Can't call mysql_server_end() multiple times prior to 5.0.46 on Windows.
 	  PHP bug#41350 MySQL bug#25621
 	*/
-	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 b05b50dfbc..19e7d063e2 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -800,10 +800,10 @@ 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.
+	  Can't call mysql_server_end() multiple times prior to 5.0.46 on Windows.
 	  PHP bug#41350 MySQL bug#25621
 	*/
-	if ((client_ver >= 50042 && client_ver < 50100) || client_ver > 50122) {
+	if ((client_ver >= 50046 && client_ver < 50100) || client_ver > 50122) {
 		mysql_server_end();
 	}
 #else