diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-21 16:19:30 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-21 16:19:30 +0000 |
| commit | 1f34be323fe3e69af00b250c3ace083a337fd7f7 (patch) | |
| tree | 5a570b86a3b89986079f6333097cc6f5924ef5ae | |
| parent | 7e2721e1b627a2194e72e988971fba54123168f0 (diff) | |
| download | php-git-1f34be323fe3e69af00b250c3ace083a337fd7f7.tar.gz | |
Revert fix for #52636 in 5.2
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c102a8e398..c276e76a8b 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1884,7 +1884,7 @@ PHP_FUNCTION(mysql_num_fields) /* {{{ 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; |