diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-18 11:50:31 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-18 11:50:31 +0000 |
| commit | 940e64dba31304c88ce7026c393bc77f0b9879ef (patch) | |
| tree | e2540ba72bdaad32c01e082b6cab433b40879472 /ext/mysql/php_mysql.c | |
| parent | 560169068da3ee93f81badf3aabc53020fdefb11 (diff) | |
| download | php-git-940e64dba31304c88ce7026c393bc77f0b9879ef.tar.gz | |
Remove duplicated code.
Use one centralized functions for data extraction.
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index b948fd2158..3056586e8c 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1993,7 +1993,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, } } #else - mysqlnd_fetch_into(mysql_result, MYSQLND_FETCH_ASSOC, return_value, MYSQLND_MYSQL); + mysqlnd_fetch_into(mysql_result, ((result_type & MYSQL_NUM)? MYSQLND_FETCH_NUM:0) | ((result_type & MYSQL_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value, MYSQLND_MYSQL); #endif #ifdef ZEND_ENGINE_2 @@ -2071,7 +2071,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, Gets a result row as an enumerated array */ PHP_FUNCTION(mysql_fetch_row) { -#ifdef MYSQL_USE_MYSQLND +#if 1 MYSQL_RES *result; zval *mysql_result; @@ -2105,7 +2105,7 @@ PHP_FUNCTION(mysql_fetch_object) Fetch a result row as an array (associative, numeric or both) */ PHP_FUNCTION(mysql_fetch_array) { -#ifndef MYSQL_USE_MYSQLND +#if 1 php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 2, 0); #else MYSQL_RES *result; @@ -2132,7 +2132,7 @@ PHP_FUNCTION(mysql_fetch_array) Fetch a result row as an associative array */ PHP_FUNCTION(mysql_fetch_assoc) { -#ifndef MYSQL_USE_MYSQLND +#if 1 php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 1, 0); #else MYSQL_RES *result; |