andrey          Sat Mar  8 14:59:37 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mysql  php_mysql.c 
    /php-src/ext/mysqli mysqli.c 
  Log:
  Fix introduced in 5.0.46, not in 5.0.42
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.23&r2=1.213.2.6.2.24&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.23 
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.24
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.23        Tue Mar  4 22:25:35 2008
+++ php-src/ext/mysql/php_mysql.c       Sat Mar  8 14:59:37 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.23 2008/03/04 22:25:35 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.24 2008/03/08 14:59:37 andrey Exp $ */
 
 /* TODO:
  *
@@ -419,7 +419,7 @@
 #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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.24&r2=1.72.2.16.2.25&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.24 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.25
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.24  Mon Feb 18 13:29:00 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar  8 14:59:37 2008
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.16.2.24 2008/02/18 13:29:00 iliaa Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.25 2008/03/08 14:59:37 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -669,7 +669,7 @@
 #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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to