com php-src: merge fix: ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Tue, 26 Nov 2013 17:15:30 +0000 |
| Subject: | com php-src: merge fix: ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74068@lists.php.net to get a copy of this message | ||
Commit: 5a3886f15c010584eecd0ff21eeca72359539fea
Author: Andrey Hristov <andrey@php.net> Tue, 26 Nov 2013 19:15:30 +0200
Parents: 40dc2429047abbd8f5dee5e3ba636ddc5b62f2de
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a3886f15c010584eecd0ff21eeca72359539fea
Log:
merge fix
Changed paths:
M ext/mysqlnd/mysqlnd.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index ead7306..6e17412 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);