diff options
| author | Andrey Hristov <andrey@php.net> | 2010-03-12 13:03:46 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-03-12 13:03:46 +0000 |
| commit | ccfd9cd744c700dfc26f73ae47036fb5ad780b4a (patch) | |
| tree | 79392547912de600fcf6cd80cc12232c3c7180f1 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | af49e58f5155383a440041c77cc1ecbaf507fde7 (diff) | |
| download | php-git-ccfd9cd744c700dfc26f73ae47036fb5ad780b4a.tar.gz | |
allow persistency of PS
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 5710377882..ea41a9a137 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -929,8 +929,8 @@ php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC) (len = php_mysqlnd_net_field_length(&p)) && len != MYSQLND_NULL_LENGTH) { - DBG_INF_FMT("Def found, length %lu", len); - meta->def = mnd_emalloc(len + 1); + DBG_INF_FMT("Def found, length %lu, persistent=%d", len, packet->persistent_alloc); + meta->def = mnd_pemalloc(len + 1, packet->persistent_alloc); memcpy(meta->def, p, len); meta->def[len] = '\0'; meta->def_length = len; @@ -943,7 +943,8 @@ php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC) "shorter than expected", p - begin - packet->header.size); } - root_ptr = meta->root = mnd_emalloc(total_len); + DBG_INF_FMT("allocing root. persistent=%d", packet->persistent_alloc); + root_ptr = meta->root = mnd_pemalloc(total_len, packet->persistent_alloc); meta->root_len = total_len; /* Now do allocs */ if (meta->catalog && meta->catalog != mysqlnd_empty_string) { |