Merge branch 'PHP-5.4' into PHP-5.5

author Remi Collet <remi@php.net>

Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)

committer Remi Collet <remi@php.net>

Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)
author Remi Collet <remi@php.net>
Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)
committer Remi Collet <remi@php.net>
Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)
diff --cc ext/mysqli/mysqli.c
Simple merge
diff --cc ext/mysqli/mysqli_api.c
Simple merge
diff --cc ext/mysqli/php_mysqli_structs.h
Simple merge
author	Remi Collet <remi@php.net>
	Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)
committer	Remi Collet <remi@php.net>
	Thu, 27 Feb 2014 07:49:33 +0000 (08:49 +0100)
		1	2
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/php_mysqli_structs.h	patch \|	diff1 \|	diff2 \|	blob \| history