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 68082b2131457635c34fa500607115fe3e4650e0..6184d44260b6a4298a5fe848918ebcd625ffcd7e 100644 (file)
--- 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 bb5ca521070984c6b0af932fb73e40ce3f5f48a1..3280ff832d4e45eedc7ab22e8da5c98c2a85de06 100644 (file)
--- 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