Merge branch '2.1' into develop

2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
--- a/server/modules/protocol/MySQL/mysql_common.c
+++ b/server/modules/protocol/MySQL/mysql_common.c
@ -1553,11 +1553,9 @@ bool mxs_mysql_is_result_set(GWBUF *buffer)
        case MYSQL_REPLY_EOF:
            /** Not a result set */
            break;
+
        default:
-            if (gwbuf_copy_data(buffer, MYSQL_HEADER_LEN + 1, 1, &cmd) && cmd > 1)
-            {
-                rval = true;
-            }
+            rval = true;
            break;
        }
    }