cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c

From: Date: Sat, 08 Mar 2008 15:17:45 +0000
Subject: cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-48974@lists.php.net to get a copy of this message
andrey Sat Mar 8 15:17:45 2008 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c Log: Bug fixed in MySQL 5.0.46 http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.254&r2=1.255&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.254 php-src/ext/mysql/php_mysql.c:1.255 --- php-src/ext/mysql/php_mysql.c:1.254 Tue Mar 4 22:31:38 2008 +++ php-src/ext/mysql/php_mysql.c Sat Mar 8 15:17:45 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.254 2008/03/04 22:31:38 felipe Exp $ */ +/* $Id: php_mysql.c,v 1.255 2008/03/08 15:17:45 andrey Exp $ */ /* TODO: * @@ -470,10 +470,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.123&r2=1.124&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.123 php-src/ext/mysqli/mysqli.c:1.124 --- php-src/ext/mysqli/mysqli.c:1.123 Sat Mar 8 15:16:08 2008 +++ php-src/ext/mysqli/mysqli.c Sat Mar 8 15:17:45 2008 @@ -17,7 +17,7 @@ | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.123 2008/03/08 15:16:08 andrey Exp $ + $Id: mysqli.c,v 1.124 2008/03/08 15:17:45 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -800,10 +800,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

« previous php.cvs (#48974) next »