Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h

diff --cc ext/mysqli/mysqli_api.c
index 53639a0670686522642e537d6ea64615edcda875,d9e52b3d3ac2f519a1254e06dbae52d55903cfab..15fcaae6f3e38aa8d3c10ec5442998bac9832158
--- 1/ext/mysqli/mysqli_api.c
--- 2/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@@ -34,64 -34,6 +34,7 @@@
  #include "php_mysqli_structs.h"
  #include "mysqli_priv.h"
  
- #if !defined(MYSQLI_USE_MYSQLND)
- /* {{{ mysqli_tx_cor_options_to_string */
- static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const unsigned int mode)
- {
-       if (mode & TRANS_COR_AND_CHAIN && !(mode & TRANS_COR_AND_NO_CHAIN)) {
-               if (str->len) {
-                       smart_str_appendl(str, ", ", sizeof(", ") - 1);
-               }
-               smart_str_appendl(str, "AND CHAIN", sizeof("AND CHAIN") - 1);
-       } else if (mode & TRANS_COR_AND_NO_CHAIN && !(mode & TRANS_COR_AND_CHAIN)) {
-               if (str->len) {
-                       smart_str_appendl(str, ", ", sizeof(", ") - 1);
-               }
-               smart_str_appendl(str, "AND NO CHAIN", sizeof("AND NO CHAIN") - 1);
-       }
- 
-       if (mode & TRANS_COR_RELEASE && !(mode & TRANS_COR_NO_RELEASE)) {
-               if (str->len) {
-                       smart_str_appendl(str, ", ", sizeof(", ") - 1);
-               }
-               smart_str_appendl(str, "RELEASE", sizeof("RELEASE") - 1);
-       } else if (mode & TRANS_COR_NO_RELEASE && !(mode & TRANS_COR_RELEASE)) {
-               if (str->len) {
-                       smart_str_appendl(str, ", ", sizeof(", ") - 1);
-               }
-               smart_str_appendl(str, "NO RELEASE", sizeof("NO RELEASE") - 1);
-       }
-       smart_str_0(str);
- }
- /* }}} */
- 
- 
- /* {{{ proto bool mysqli_commit_or_rollback_libmysql */
- static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, const unsigned int mode, const char * const name)
- {
-       int ret;
-       smart_str tmp_str = {0, 0, 0};
-       mysqli_tx_cor_options_to_string(conn, &tmp_str, mode);
-       smart_str_0(&tmp_str);
- 
-       {
-               char * commented_name = NULL;
-               unsigned int commented_name_len = name? spprintf(&commented_name, 0, " /*%s*/", name):0;
-               char * query;
-               unsigned int query_len = spprintf(&query, 0, (commit? "COMMIT%s %s":"ROLLBACK%s %s"),
-                                                                                 commented_name? commented_name:"", tmp_str.c? tmp_str.c:"");
-               smart_str_free(&tmp_str);
- 
-               ret = mysql_real_query(conn, query, query_len);
-               efree(query);
-               if (commented_name) {
-                       efree(commented_name);
-               }
-       }
- }
- /* }}} */
- #endif
 +
  /* {{{ proto mixed mysqli_affected_rows(object link)
     Get number of affected rows in previous MySQL operation */
  PHP_FUNCTION(mysqli_affected_rows)

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