Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt

diff --cc ext/mysql/php_mysql.c
Simple merge

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

diff --cc ext/mysqli/mysqli_api.c
Simple merge

diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge

diff --cc ext/mysqli/tests/mysqli_begin_transaction.phpt
index 7e708316b40f7ca777eef84f6696677af0766edc,6c0508172fffc7245f2a5896bab33296ef56946a..c92e718d5706d7627500fbf87cf86e095dbd599d
--- 1/ext/mysqli/tests/mysqli_begin_transaction.phpt
--- 2/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@@ -131,10 -120,7 +120,16 @@@ if (!have_innodb($link)
  ?>
  --EXPECTF--
  NULL
++<<<<<<< HEAD
 +[017] [1792] %s
 +[018] invalid_flag = %d [%d]%A
  
  Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
  [019] [%d]%A
 +[020] [%d]%A
++=======
++
++Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
++[019] [%d]%A
++>>>>>>> 3204ad5858a5abc50b11b8527d22c82eb07a80cc
  done!

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

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

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