ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while...

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 62db2c66369bb3c3937f6d71246bfecc773f20d8..e6e75be16a67121f01f92d017cea103cf57ea652 100644 (file)
--- 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 ac01102bba0361336d08e4a87e882424a7a6bcc5..df3a3955c89642c6ccbcc2ca2c267a17a810ac8c 100644 (file)
--- 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