svn: /php/php-src/branches/PHP_5_2/ NEWS ext/mysql/php_mysql.c
| From: | Kalle Sommer Nielsen | Date: | Sat, 21 Aug 2010 16:19:30 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_2/ NEWS ext/mysql/php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63346@lists.php.net to get a copy of this message | ||
kalle Sat, 21 Aug 2010 16:19:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302613
Log:
Revert fix for #52636 in 5.2
Bug: http://bugs.php.net/52636 (Closed) php_mysql_fetch_hash
writes long value into int
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-08-21 16:09:18 UTC (rev 302612)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-08-21 16:19:30 UTC (rev 302613)
@@ -3,8 +3,6 @@
?? ??? 2010, PHP 5.2.15
- Fixed possible crash in mssql_fetch_batch(). (Kalle)
-- Fixed bug #52636 (php_mysql_fetch_hash writes long value into int).
- (Kalle, rein at basefarm dot no)
- Fixed bug #52436 (Compile error if systems do not have stdint.h)
(Sriram Natarajan)
- Fixed bug #52390 (mysqli_report() should be per-request setting). (Kalle)
Modified: php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c 2010-08-21 16:09:18 UTC (rev 302612)
+++ php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c 2010-08-21 16:19:30 UTC (rev 302613)
@@ -1884,7 +1884,7 @@
/* {{{ php_mysql_fetch_hash
*/
-static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int expected_args,
int into_object)
+static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int expected_args,
int into_object)
{
zval **result, **arg2;
MYSQL_RES *mysql_result;