]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:23:21 +0000 (10:23 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:23:21 +0000 (10:23 +0800)
commitcbb5d42b9b970b04a2e328c6b8e211419f43b0c2
tree38d824ab5b92591fd4ba346b32c29ebbc5536941
parentf3824ad16644c53645e7428d2e838278f5a0e1c4
parenta426e0b05074621643c44b67ed2d0d8674721bf5
Merge branch 'PHP-5.4' into PHP-5.5
26 files changed:
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd_alloc.c
ext/mysqlnd/mysqlnd_alloc.h
ext/mysqlnd/mysqlnd_auth.c
ext/mysqlnd/mysqlnd_bt.c
ext/mysqlnd/mysqlnd_debug.c
ext/mysqlnd/mysqlnd_debug.h
ext/mysqlnd/mysqlnd_driver.c
ext/mysqlnd/mysqlnd_enum_n_def.h
ext/mysqlnd/mysqlnd_ext_plugin.c
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_net.c
ext/mysqlnd/mysqlnd_plugin.c
ext/mysqlnd/mysqlnd_priv.h
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_result_meta.c
ext/mysqlnd/mysqlnd_reverse_api.h
ext/mysqlnd/mysqlnd_statistics.c
ext/mysqlnd/mysqlnd_structs.h
ext/mysqlnd/mysqlnd_wireprotocol.c
ext/mysqlnd/mysqlnd_wireprotocol.h
ext/mysqlnd/php_mysqlnd.c
ext/phar/phar_path_check.c