diff options
| author | Andrey Hristov <andrey@php.net> | 2009-06-08 10:19:29 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-06-08 10:19:29 +0000 |
| commit | efc752375e7afff287d4ed651d87644f9a082894 (patch) | |
| tree | d3e8dcbe382da0910e9409a80214379e4ed643cb /ext/mysqlnd/php_mysqlnd.c | |
| parent | 4ab529f05830f2a8d07c72d8052dae59d222e1dd (diff) | |
| download | php-git-efc752375e7afff287d4ed651d87644f9a082894.tar.gz | |
Merge with the branch, someone made changes in PHP5_3 and did not merge.
Also switch off the zval cache for now.
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index e08f0e47b4..7ebb748024 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -47,12 +47,12 @@ PHPAPI void mysqlnd_minfo_print_hash(zval *values) zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values); while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&values_entry, &pos_values) == SUCCESS) { + TSRMLS_FETCH(); zstr string_key; uint string_key_len; ulong num_key; int s_len; char *s = NULL; - TSRMLS_FETCH(); zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len, &num_key, 0, &pos_values); |