com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/mysqli/mysqli.c ext/m ysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c ext/m ysqli/php_mysqli_structs.h ext/openssl/xp_ssl.c e xt/zip/php_zip.h

Commit: 485e999d9c5af505cdda7f9dd3487623ef55c695 Author: Anatol Belski <ab@php.net> Wed, 29 Jan 2014 22:08:50 +0100 Parents: 7554d079453d1af9f577f3eabae93475b0d29ab3 79e0c273b8690bca12fc8b82cab3d7a47abb9779 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=485e999d9c5af505cdda7f9dd3487623ef55c695 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/mysqli/php_mysqli_structs.h Changed paths: MM ext/mysqli/mysqli.c MM ext/mysqli/mysqli_api.c MM ext/mysqli/mysqli_nonapi.c MM ext/mysqli/php_mysqli_structs.h MM ext/openssl/xp_ssl.c MM ext/zip/php_zip.h Diff: diff --cc ext/mysqli/php_mysqli_structs.h index 93957d3,cc0c8fe..ef1c407 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@@ -325,15 -325,16 +325,16 @@@ ZEND_BEGIN_MODULE_GLOBALS(mysqli char *default_user; char *default_socket; char *default_pw; - long reconnect; - long allow_local_infile; - long strict; - long error_no; + php_int_t reconnect; + php_int_t allow_local_infile; + php_int_t strict; + php_int_t error_no; char *error_msg; - long report_mode; + php_int_t report_mode; HashTable *report_ht; - unsigned long multi_query; - unsigned long embedded; + php_uint_t multi_query; + php_uint_t embedded; + zend_bool rollback_on_cached_plink; ZEND_END_MODULE_GLOBALS(mysqli)