diff options
| author | Andrey Hristov <andrey@php.net> | 2014-03-10 12:53:17 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-03-10 12:53:17 +0200 |
| commit | c8033ac2076bf4b4d66f8d350b4afc232a863419 (patch) | |
| tree | b1012b15e93b37181934632190b9fcb9661235da /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | aa23d754a9aceb1312a847d588a152e224e08c5b (diff) | |
| parent | 3a76cb2d9570f02fb189699c092ecf1f7491e424 (diff) | |
| download | php-git-c8033ac2076bf4b4d66f8d350b4afc232a863419.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index df9dde592a..dfdba4084e 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1741,8 +1741,9 @@ php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval zval_dtor(*current_field); ZVAL_STRINGL(*current_field, (char *) start, bit_area - start - 1, 0); } - } else - ZVAL_STRINGL(*current_field, (char *)p, len, 0); + } else { + ZVAL_STRINGL(*current_field, (char *)p, len, 0); + } p += len; last_field_was_string = TRUE; } |