com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/mysqlnd/mysqlnd_result .c

Commit: a40c20f764a7e0bb6cafcb256a530332f1904642 Author: Anatol Belski <ab@php.net> Tue, 21 Jan 2014 17:17:27 +0100 Parents: 5b83f7252af41befcca330787b1cd24dc6cfee1f 4b7148711b7200999c96ee4d43c5206c08e6765b Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a40c20f764a7e0bb6cafcb256a530332f1904642 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/mysqlnd/mysqlnd_result.c Changed paths: MM ext/mysqlnd/mysqlnd_result.c Diff: diff --cc ext/mysqlnd/mysqlnd_result.c index 90b6761,fbf8ea0..611fb75 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@@ -185,11 -185,13 +185,13 @@@ MYSQLND_METHOD(mysqlnd_res, free_buffer DBG_INF_FMT("Freeing "MYSQLND_LLU_SPEC" row(s)", set->row_count); if (set->data) { - unsigned int copy_on_write_performed = 0; - unsigned int copy_on_write_saved = 0; + php_uint_t copy_on_write_performed = 0; + php_uint_t copy_on_write_saved = 0; + zval **data = set->data; + set->data = NULL; /* prevent double free if following loop is interrupted */ for (row = set->row_count - 1; row >= 0; row--) { - zval **current_row = set->data + row * field_count; + zval **current_row = data + row * field_count; MYSQLND_MEMORY_POOL_CHUNK *current_buffer = set->row_buffers[row]; int64_t col;