com php-src: Revert "ext/pdo_mysql/tests/pdo_mysql_attr _oracle_nulls.phpt fails in trunk as well whi le building with libmysql": ext/pdo/pdo_stmt.c
ext/pdo_mysql/mysql_statement.c

Commit: 28e6a2b45211adda1fc793ff668ed477e9dad149 Author: Xinchen Hui <laruence@php.net> Thu, 8 May 2014 18:34:40 +0800 Parents: 29b35292923596413a0fbf49890a2cbb16cbf8b4 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28e6a2b45211adda1fc793ff668ed477e9dad149 Log: Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql" This reverts commit 29b35292923596413a0fbf49890a2cbb16cbf8b4. 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 e6e75be..62db2c6 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); - 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)); } } diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index df3a395..ac01102 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -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