com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_ps.c ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_wireprotocol.c

From: Date: Tue, 26 Nov 2013 17:02:45 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_ps.c ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_wireprotocol.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74069@lists.php.net to get a copy of this message
Commit: 40dc2429047abbd8f5dee5e3ba636ddc5b62f2de Author: Andrey Hristov <andrey@php.net> Tue, 26 Nov 2013 19:02:45 +0200 Parents: 29ee38bf0d94351b86dc74cf187e884ae46ce71b 74ba88e186a0f70caa6e8e5a440a3a204afabf50 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=40dc2429047abbd8f5dee5e3ba636ddc5b62f2de Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: NEWS ext/mysqlnd/mysqlnd.c Changed paths: MM ext/mysqlnd/mysqlnd..c MM ext/mysqlnd/mysqlnd_ps.c MM ext/mysqlnd/mysqlnd_result.c MM ext/mysqlnd/mysqlnd_wireprotocol.c Diff: diff --cc ext/mysqlnd/mysqlnd.c index c9e134f,20e63e1..ead7306 --- a/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);

« previous php.cvs (#74069) next »