andrey Sat Mar 8 15:00:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
Log:
Bug fixed in 5.0.46
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.12&r2=1.213.2.6.2.16.2.13&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.16.2.12
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.12 Tue Mar 4 22:29:29 2008
+++ php-src/ext/mysql/php_mysql.c Sat Mar 8 15:00:50 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.12 2008/03/04 22:29:29 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.13 2008/03/08 15:00:50 andrey Exp $ */
/* TODO:
*
@@ -473,10 +473,10 @@
#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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.18&r2=1.72.2.16.2.17.2.19&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.18
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.19
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.18 Sat Mar 8 14:55:52 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar 8 15:00:50 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.18 2008/03/08 14:55:52 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.19 2008/03/08 15:00:50 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -802,10 +802,10 @@
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
