Merge branch 'PHP-5.4' into PHP-5.5

diff --cc ext/mysqlnd/mysqlnd.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_alloc.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_alloc.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_auth.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_bt.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_debug.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_debug.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_driver.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_enum_n_def.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_ext_plugin.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_loaddata.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_net.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_plugin.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_priv.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_ps.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_ps_codec.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_result.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_result_meta.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_reverse_api.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_statistics.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_structs.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_wireprotocol.h
Simple merge

diff --cc ext/mysqlnd/php_mysqlnd.c
Simple merge

diff --cc ext/phar/phar_path_check.c
Simple merge