Merge branch '2.3' into 2.4

2019-09-20 09:36:23 +03:00
parent bd3107e7ca aa7be1447d
commit 19487d2bfb
7 changed files with 61 additions and 22 deletions
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@ -892,6 +892,9 @@ const char* qc_op_to_string(qc_query_op_t op)
    case QUERY_OP_SELECT:
        return "QUERY_OP_SELECT";

+    case QUERY_OP_SET:
+        return "QUERY_OP_SET";
+
    case QUERY_OP_SHOW:
        return "QUERY_OP_SHOW";