diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-23 19:34:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-23 19:34:55 +0800 |
| commit | 56a966e88a98bf04b2cd253b9b18136c0cc4028b (patch) | |
| tree | b676c55d97100d30ea965eeb1bdf812898e757d3 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 92a708989380bfb5d5da00665895025398bdbc91 (diff) | |
| download | php-git-56a966e88a98bf04b2cd253b9b18136c0cc4028b.tar.gz | |
Respect the origin behavior (fix one test: ext/pdo_mysql/tests/bug_33689.phpt)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 7931d6d0c6..8cdd712f0b 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1328,9 +1328,7 @@ php_mysqlnd_rset_field_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) DBG_INF_FMT("Def found, length %lu, persistent=%u", len, packet->persistent_alloc); meta->def = STR_INIT((char *)p, len, packet->persistent_alloc); p += len; - } else { - meta->def = STR_EMPTY_ALLOC(); - } + } DBG_INF_FMT("allocing root. persistent=%u", packet->persistent_alloc); |