Merge branch '2.1' into develop

Bringing in MXS-1406
2017-09-13 10:02:13 +03:00
parent 16d3eab59f 49ab5797a2
commit a2d0d24b2c
5 changed files with 13 additions and 1 deletions
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@ -362,6 +362,9 @@ const char* qc_op_to_string(qc_query_op_t op)
    case QUERY_OP_ALTER:
        return "QUERY_OP_ALTER";

+    case QUERY_OP_CALL:
+        return "QUERY_OP_CALL";
+
    case QUERY_OP_CHANGE_DB:
        return "QUERY_OP_CHANGE_DB";