Merge branch '2.0' into 2.1

2017-03-02 14:05:42 +02:00
parent 3bafcae343 075ca42482
commit 789c14197d
5 changed files with 59 additions and 13 deletions
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@ -861,7 +861,12 @@ static bool process_client_commands(DCB* dcb, int bytes_available, GWBUF** buffe
            }

            MySQLProtocol *proto = (MySQLProtocol*)dcb->protocol;
-            proto->current_command = cmd;
+            if (dcb->protocol_packet_length - MYSQL_HEADER_LEN != GW_MYSQL_MAX_PACKET_LEN)
+            {
+                /** We're processing the first packet of a command */
+                proto->current_command = cmd;
+            }
+
            dcb->protocol_packet_length = pktlen + MYSQL_HEADER_LEN;
            dcb->protocol_bytes_processed = 0;
        }