com php-src: ext/pdo_mysql/tests/pdo_mysql_attr_oracle _nulls.phpt fails in trunk as well while buil ding with libmysql: ext/pdo/pdo_stmt.c ext/pdo_
mysql/mysql_statement.c

Commit: 29b35292923596413a0fbf49890a2cbb16cbf8b4 Author: Xinchen Hui <laruence@php.net> Thu, 8 May 2014 18:30:21 +0800 Parents: 7de633c5490cbe9845bf62f00036f5ec5674df84 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29b35292923596413a0fbf49890a2cbb16cbf8b4 Log: ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql Changed paths: M ext/pdo/pdo_stmt.c M ext/pdo_mysql/mysql_statement.c Diff: diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 62db2c6..e6e75be 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt..c @@ -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); - do { + while (do_fetch(stmt, 1, &data, how | flags, PDO_FETCH_ORI_NEXT, 0, 0 TSRMLS_CC)) { add_next_index_zval(return_value, &data); - } while (do_fetch(stmt, 1, &data, how | flags, PDO_FETCH_ORI_NEXT, 0, 0 TSRMLS_CC)); + } } } diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index ac01102..df3a395 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -404,8 +404,7 @@ 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) { - //???? This line is very suspicious - //stmt->column_count = (int)mysql_num_fields(S->result); + stmt->column_count = (int)mysql_num_fields(S->result); mysql_stmt_free_result(S->stmt); } #endif