cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_result.c
| From: | Rob Richards | Date: | Fri, 25 Jan 2008 15:54:58 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_result.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47989@lists.php.net to get a copy of this message | ||
rrichards Fri Jan 25 15:54:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd_result.c
Log:
MFH: fix win32 compile
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.6&r2=1.4.2.7&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.6 php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.7
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.6 Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.c Fri Jan 25 15:54:58 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.c,v 1.4.2.6 2008/01/23 19:11:28 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.7 2008/01/25 15:54:58 rrichards Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -766,9 +766,9 @@
if (result->data->data_cursor &&
(result->data->data_cursor - result->data->data) < result->data->row_count)
{
- ret = mnd_malloc(result->field_count * sizeof(char *));
-
zval **current_row = *result->data->data_cursor;
+
+ ret = mnd_malloc(result->field_count * sizeof(char *));
for (i = 0; i < result->field_count; i++) {
zval *data = current_row[i];
if (Z_TYPE_P(data) != IS_NULL) {