Merge branch '2.2' into develop

2018-09-11 12:57:19 +03:00
parent 6938df0d62 c04073a96c
commit fd176c4122
18 changed files with 255 additions and 108 deletions
--- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
@ -866,7 +866,8 @@ static int gw_read_and_write(DCB* dcb)
                    if (mxs_mysql_is_result_set(read_buffer))
                    {
                        bool more = false;
-                        if (modutil_count_signal_packets(read_buffer, 0, &more, NULL) != 2)
+                        int eof_cnt = modutil_count_signal_packets(read_buffer, 0, &more, NULL);
+                        if (more || eof_cnt % 2 != 0)
                        {
                            dcb_readq_prepend(dcb, read_buffer);
                            return 0;