From: Xinchen Hui <laruence@php.net>
Date: Thu, 8 May 2014 10:34:56 +0000 (+0800)
Subject: ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while... 
X-Git-Tag: POST_PHPNG_MERGE~384^2~24^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7541f93f97b8deeb02ce0dada7a6f2e77e6124b0;p=php

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

diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index ac01102bba..df3a3955c8 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