Merge branch '2.1' into 2.2

2017-09-27 13:04:14 +03:00
parent 2633ad2fe4 e97f26f170
commit 7b6680b8fa
6 changed files with 70 additions and 18 deletions
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@ -1279,13 +1279,14 @@ static bool command_is_mandatory(const GWBUF *buffer)
 {
    switch (MYSQL_GET_COMMAND((uint8_t*)GWBUF_DATA(buffer)))
    {
-    case MXS_COM_QUIT:
-    case MXS_COM_PING:
    case MXS_COM_CHANGE_USER:
-    case MXS_COM_SET_OPTION:
    case MXS_COM_FIELD_LIST:
-    case MXS_COM_PROCESS_KILL:
+    case MXS_COM_INIT_DB:
+    case MXS_COM_PING:
    case MXS_COM_PROCESS_INFO:
+    case MXS_COM_PROCESS_KILL:
+    case MXS_COM_QUIT:
+    case MXS_COM_SET_OPTION:
        return true;

    default: