Merge branch '2.2' into develop

2018-06-04 16:00:19 +03:00
parent a16d8c2ca0 9d0b1be08b
commit 4a3216d483
14 changed files with 113 additions and 24 deletions
--- a/include/maxscale/query_classifier.h
+++ b/include/maxscale/query_classifier.h
@ -104,6 +104,7 @@ typedef enum qc_query_op
    QUERY_OP_EXPLAIN,
    QUERY_OP_GRANT,
    QUERY_OP_INSERT,
+    QUERY_OP_LOAD_LOCAL,
    QUERY_OP_LOAD,
    QUERY_OP_REVOKE,
    QUERY_OP_SELECT,