Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd.c

diff --cc ext/mysqlnd/mysqlnd.c
index c9e134f7a3ee6de4361304f9f7afac24f3a3265f,20e63e1405c88801bad56ff16a06770f865fb050..ead73065fcf3265b0fa838f12e243ca8e55157c0
--- 1/ext/mysqlnd/mysqlnd.c
--- 2/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@@ -317,8 -313,9 +318,14 @@@ MYSQLND_METHOD(mysqlnd_conn_data, simpl
        enum_func_status ret = PASS;
        MYSQLND_PACKET_COMMAND * cmd_packet;
  
++<<<<<<< HEAD
 +      DBG_ENTER("mysqlnd_conn_data::simple_command_send_request");
 +      DBG_INF_FMT("command=%s silent=%u", mysqlnd_command_to_text[command], silent);
++=======
+       DBG_ENTER("mysqlnd_conn_data::simple_command");
+       DBG_INF_FMT("command=%s ok_packet=%u silent=%u", mysqlnd_command_to_text[command], ok_packet, silent);
+       DBG_INF_FMT("conn->server_status=%u", conn->upsert_status->server_status);
++>>>>>>> PHP-5.4
  
        switch (CONN_GET_STATE(conn)) {
                case CONN_READY:
@@@ -1033,8 -882,14 +1036,16 @@@ MYSQLND_METHOD(mysqlnd_conn_data, conne
                        }
                        conn->unix_socket_len = strlen(conn->unix_socket);
                }
 -              conn->client_flag               = mysql_flags;
                conn->max_packet_size   = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE;
                /* todo: check if charset is available */
++<<<<<<< HEAD
++=======
+               conn->server_capabilities = greet_packet->server_capabilities;
+               memset(conn->upsert_status, 0, sizeof(*conn->upsert_status));
+               conn->upsert_status->warning_count = 0;
+               conn->upsert_status->server_status = greet_packet->server_status;
+               conn->upsert_status->affected_rows = 0;
++>>>>>>> PHP-5.4
  
                SET_EMPTY_ERROR(*conn->error_info);
  

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

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

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