Re: cvs: php-src /ext/mysqlnd mysqlnd_result.c
| From: | Andrey Hristov | Date: | Mon, 28 Jan 2008 10:05:24 +0000 |
| Subject: | Re: cvs: php-src /ext/mysqlnd mysqlnd_result.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-48047@lists.php.net to get a copy of this message | ||
Hi Rob,
sorry - my fault. I saw the error in another mysqlnd build on Windows
but seems I forgot to port it back :(
Andrey
Rob Richards wrote:
> rrichards Fri Jan 25 15:54:31 2008 UTC
>
> Modified files:
> /php-src/ext/mysqlnd mysqlnd_result.c
> Log:
> fix win32 compile
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.10&r2=1.11&diff_format=u
> Index: php-src/ext/mysqlnd/mysqlnd_result.c
> diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.10 php-src/ext/mysqlnd/mysqlnd_result.c:1.11
> --- php-src/ext/mysqlnd/mysqlnd_result.c:1.10 Wed Jan 23 19:09:33 2008
> +++ php-src/ext/mysqlnd/mysqlnd_result.c Fri Jan 25 15:54:31 2008
> @@ -18,7 +18,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: mysqlnd_result.c,v 1.10 2008/01/23 19:09:33 andrey Exp $ */
> +/* $Id: mysqlnd_result.c,v 1.11 2008/01/25 15:54:31 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) {
>