Merge branch '2.3' into develop

2019-02-11 13:14:52 +02:00
parent 7a99b5d253 38069bb32d
commit 661f1dd4e4
6 changed files with 15 additions and 9 deletions
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@ -901,7 +901,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);