cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_result.c

andrey Thu May 29 15:49:32 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_result.c Log: Fix a bug that let PDO fail. It has been long fixed, but locally. Now I know what it fixes :) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.19&r2=1.4.2.20&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_result.c diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.19 php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.20 --- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.19 Wed May 7 15:14:26 2008 +++ php-src/ext/mysqlnd/mysqlnd_result.c Thu May 29 15:49:32 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_result.c,v 1.4.2.19 2008/05/07 15:14:26 andrey Exp $ */ +/* $Id: mysqlnd_result.c,v 1.4.2.20 2008/05/29 15:49:32 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,