From: Andrey Hristov <andrey@php.net>
Date: Thu, 29 May 2008 15:50:10 +0000 (+0000)
Subject: MFB
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1631
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a72f8d6ede5cbbd1aeaeb31aee38ba6324d23cb;p=php

MFB
---

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 7b5f3d6af4..6b94e2ca92 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -521,8 +521,8 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC
 				conn->last_query_type = QUERY_SELECT;
 				CONN_SET_STATE(conn, CONN_FETCHING_DATA);
 				/* PS has already allocated it */
+				conn->field_count = rset_header.field_count;
 				if (!stmt) {
-					conn->field_count = rset_header.field_count;
 					result =
 						conn->current_result=
 							mysqlnd_result_init(rset_header.field_count,
@@ -536,7 +536,6 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC
 						  prepared statements can't send result set metadata for these queries
 						  on prepare stage. Read it now.
 						*/
-						conn->field_count = rset_header.field_count;
 						result =
 							stmt->result =
 								mysqlnd_result_init(rset_header.field_count,