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

Commit: b873bb63c5e4c68e7f6806a78a1de732f4634b3b Author: Anatol Belski <ab@php.net> Tue, 11 Mar 2014 09:58:36 +0100 Parents: b99af06dfe083eb780abb44249ccf78973276cf7 cc409199f9e0ae5f819370600f6f1abc684e09fb Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b873bb63c5e4c68e7f6806a78a1de732f4634b3b Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit. Conflicts: ext/mysqlnd/mysqlnd_structs.h Changed paths: MM ext/mysqlnd/mysqlnd_ps.c MM ext/mysqlnd/mysqlnd_result.c MM ext/mysqlnd/mysqlnd_structs.h Diff: diff --cc ext/mysqlnd/mysqlnd_structs.h index 3b653e5,7c7ab1a..f1eed99 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@@ -630,8 -630,8 +630,8 @@@ typedef const MYSQLND_FIELD *(*func_mys typedef const MYSQLND_FIELD *(*func_mysqlnd_res__fetch_fields)(MYSQLND_RES * const result TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_res__read_result_metadata)(MYSQLND_RES * result, MYSQLND_CONN_DATA * conn TSRMLS_DC); -typedef unsigned long * (*func_mysqlnd_res__fetch_lengths)(MYSQLND_RES * const result TSRMLS_DC); +typedef php_uint_t * (*func_mysqlnd_res__fetch_lengths)(MYSQLND_RES * const result TSRMLS_DC); - typedef enum_func_status (*func_mysqlnd_res__store_result_fetch_data)(MYSQLND_CONN_DATA * const conn, MYSQLND_RES * result, MYSQLND_RES_METADATA *meta, zend_bool binary_protocol TSRMLS_DC); + typedef enum_func_status (*func_mysqlnd_res__store_result_fetch_data)(MYSQLND_CONN_DATA * const conn, MYSQLND_RES * result, MYSQLND_RES_METADATA * meta, MYSQLND_MEMORY_POOL_CHUNK *** row_buffers, zend_bool binary_protocol TSRMLS_DC); typedef void (*func_mysqlnd_res__free_result_buffers)(MYSQLND_RES * result TSRMLS_DC); /* private */ typedef enum_func_status (*func_mysqlnd_res__free_result)(MYSQLND_RES * result, zend_bool implicit TSRMLS_DC);