Merge branch '2.1.7' into develop-2.1-merge

2017-09-12 11:08:02 +03:00
parent 65066ae126 2a4bfc31ec
commit 02b9e0a01d
28 changed files with 367 additions and 90 deletions
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@ -354,7 +354,8 @@ static inline bool MYSQL_IS_ERROR_PACKET(const uint8_t* header)

 static inline bool MYSQL_IS_COM_QUIT(const uint8_t* header)
 {
-    return MYSQL_GET_COMMAND(header) == MYSQL_COM_QUIT;
+    return MYSQL_GET_COMMAND(header) == MYSQL_COM_QUIT &&
+        MYSQL_GET_PAYLOAD_LEN(header) == 1;
 }

 static inline bool MYSQL_IS_COM_INIT_DB(const uint8_t* header)