Merge branch 'develop' into MXS-329-develop-20151111

server/modules/include/maxinfo.h

@@ -73,7 +73,12 @@ typedef enum
 	MAXOP_LITERAL,
 	MAXOP_PREDICATE,
 	MAXOP_LIKE,
-	MAXOP_EQUAL
+	MAXOP_EQUAL,
+    MAXOP_FLUSH,
+    MAXOP_SET,
+    MAXOP_CLEAR,
+    MAXOP_SHUTDOWN,
+    MAXOP_RESTART
 } MAXINFO_OPERATOR;
 
 /**
@@ -109,6 +114,11 @@ typedef struct maxinfo_tree {
 #define LT_FROM			7
 #define LT_STAR			8
 #define LT_VARIABLE		9
+#define LT_FLUSH        10
+#define LT_SET          11
+#define LT_CLEAR        12
+#define LT_SHUTDOWN     13
+#define LT_RESTART      14
 
 
 /**