diff options
| author | Johannes Schlüter <johannes@php.net> | 2008-12-01 21:20:27 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2008-12-01 21:20:27 +0000 |
| commit | b79774409e953dfe829e098232d4ebf8d1ccbd77 (patch) | |
| tree | ce1bd6a8dfaab845d4502125a483ef6104cc4441 /ext/mysql/php_mysql.c | |
| parent | f27f49cf96b5360748d0ef7b402d0d0c63b36cf4 (diff) | |
| download | php-git-b79774409e953dfe829e098232d4ebf8d1ccbd77.tar.gz | |
Fix mysql_fetch_* and tests after param parsing changes
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c844ed0862..a827770705 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -2006,8 +2006,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, } result_type = MYSQL_ASSOC; } else { - result_type = MYSQL_BOTH; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { return; } @@ -2170,7 +2168,7 @@ PHP_FUNCTION(mysql_fetch_row) MYSQL_RES *result; zval *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &mysql_result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_result) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); @@ -2207,7 +2205,7 @@ PHP_FUNCTION(mysql_fetch_array) zval *mysql_result; long mode = MYSQLND_FETCH_BOTH; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &mysql_result, &mode) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mysql_result, &mode) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); @@ -2228,7 +2226,7 @@ PHP_FUNCTION(mysql_fetch_assoc) MYSQL_RES *result; zval *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &mysql_result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_result) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); |