diff options
| author | Andrey Hristov <andrey@php.net> | 2013-11-26 19:15:30 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-11-26 19:15:30 +0200 |
| commit | 5a3886f15c010584eecd0ff21eeca72359539fea (patch) | |
| tree | 71704950a60f8bb4fb580aa03f95e0b685909298 | |
| parent | 40dc2429047abbd8f5dee5e3ba636ddc5b62f2de (diff) | |
| download | php-git-5a3886f15c010584eecd0ff21eeca72359539fea.tar.gz | |
merge fix
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index ead73065fc..6e17412edb 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -318,14 +318,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, simple_command_send_request)(MYSQLND_CONN_DATA 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: @@ -814,6 +809,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, { goto err; } + 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; @@ -1038,14 +1034,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, } 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); |