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/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@ -148,8 +148,6 @@ uint32_t get_prepare_type(GWBUF* buffer)
        }
    }

-    mxb_assert((type & (QUERY_TYPE_PREPARE_STMT | QUERY_TYPE_PREPARE_NAMED_STMT)) == 0);
-
    return type;
 }