Merge branch '2.2' into 2.3

2019-02-08 16:14:58 +02:00
parent c0593936b8 3c5dd257fd
commit d04fc6c4b9
3 changed files with 7 additions and 5 deletions
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@ -920,7 +920,7 @@ static int gw_read_and_write(DCB* dcb)
    if (proto->ignore_replies > 0)
    {
        /** The reply to a COM_CHANGE_USER is in packet */
-        GWBUF* query = proto->stored_query;
+        GWBUF* query = modutil_get_next_MySQL_packet(&proto->stored_query);
        proto->stored_query = NULL;
        proto->ignore_replies--;
        mxb_assert(proto->ignore_replies >= 0);