php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-06 23:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql"

Browse Source 
This reverts commit 29b3529292.
This commit is contained in:
Xinchen Hui
2014-05-08 18:34:40 +08:00
parent 29b3529292
commit 28e6a2b452
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pdo/pdo_stmt.c
View File

@@ -1516,9 +1516,9 @@ static PHP_METHOD(PDOStatement, fetchAll)
while (do_fetch(stmt, 1, &data, how | flags, PDO_FETCH_ORI_NEXT, 0, return_all TSRMLS_CC));
} else {
array_init(return_value);
while (do_fetch(stmt, 1, &data, how | flags, PDO_FETCH_ORI_NEXT, 0, 0 TSRMLS_CC)) {
do {
add_next_index_zval(return_value, &data);
}
} while (do_fetch(stmt, 1, &data, how | flags, PDO_FETCH_ORI_NEXT, 0, 0 TSRMLS_CC));
}
}

3
ext/pdo_mysql/mysql_statement.c
View File

@@ -404,7 +404,8 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
/* ensure that we free any previous unfetched results */
#ifndef PDO_USE_MYSQLND
if (S->stmt) {
stmt->column_count = (int)mysql_num_fields(S->result);
//???? This line is very suspicious
//stmt->column_count = (int)mysql_num_fields(S->result);
mysql_stmt_free_result(S->stmt);
}
#endif