Merge branch '2.2' into develop

2018-04-30 12:38:19 +03:00
parent 2f8bb71a58 1e700ab9ba
commit 490d8c0963
10 changed files with 93 additions and 26 deletions
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@ -353,6 +353,7 @@ typedef struct
    int                    ignore_replies;               /*< How many replies should be discarded */
    GWBUF*                 stored_query;                 /*< Temporarily stored queries */
    bool                   collect_result;               /*< Collect the next result set as one buffer */
+    bool                   changing_user;
    uint32_t               num_eof_packets;              /*< Encountered eof packet number, used for check packet type */
 #if defined(SS_DEBUG)
    skygw_chk_t            protocol_chk_tail;