Merge branch '2.3' into develop

2019-03-21 09:26:06 +02:00
parent 09ae5d741c 65b4ac7c1b
commit 2ba7e63e7e
18 changed files with 583 additions and 152 deletions
--- a/server/modules/protocol/MySQL/rwbackend.cc
+++ b/server/modules/protocol/MySQL/rwbackend.cc
@ -191,6 +191,14 @@ void RWBackend::process_reply(GWBUF* buffer)
                // TODO: Don't clone the buffer
                GWBUF* tmp = gwbuf_clone(buffer);
                tmp = gwbuf_consume(tmp, mxs_mysql_get_packet_len(tmp));
+
+                // Consume repeating OK packets
+                while (mxs_mysql_more_results_after_ok(buffer) && have_next_packet(tmp))
+                {
+                    tmp = gwbuf_consume(tmp, mxs_mysql_get_packet_len(tmp));
+                    mxb_assert(tmp);
+                }
+
                process_reply(tmp);
                gwbuf_free(tmp);
                return;