andrey Thu May 29 15:50:10 2008 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_result.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.23
php-src/ext/mysqlnd/mysqlnd_result.c:1.24
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.23 Wed May 7 15:16:27 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.c Thu May 29 15:50:10 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.c,v 1.23 2008/05/07 15:16:27 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.24 2008/05/29 15:50:10 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -521,8 +521,8 @@
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 @@
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,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
