Merge branch '2.2' into develop

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -1793,6 +1793,7 @@ static void parsing_info_done(void* ptr)
                 free(field.table);
                 free(field.column);
             }
+            free(fi.fields);
         }
         free(pi->function_infos);
 

query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y

@@ -629,7 +629,7 @@ columnid(A) ::= nm(X). {
   PREVIOUS
   QUICK
   RAISE RECURSIVE /*REINDEX*/ RELEASE /*RENAME*/ /*REPLACE*/ RESTRICT ROLLBACK ROLLUP ROW
-  SAVEPOINT SELECT_OPTIONS_KW /*SEQUENCE*/ SLAVE /*START*/ STATUS
+  SAVEPOINT SELECT_OPTIONS_KW /*SEQUENCE*/ SLAVE /*START*/ STATEMENT STATUS
   TABLES TEMP TEMPTABLE /*TRIGGER*/
   /*TRUNCATE*/
   // TODO: UNSIGNED is a reserved word and should not automatically convert into an identifer.
@@ -3157,6 +3157,14 @@ cmd ::= SET set_scope(X) TRANSACTION transaction_characteristics. {
   maxscaleSet(pParse, X, MXS_SET_TRANSACTION, 0);
 }
 
+cmd ::= SET STATEMENT variable_assignments(X) FOR cmd. {
+  // The parsing of cmd will cause the relevant maxscale-callback to
+  // be called, so we neither need to call it here, nor free cmd (as
+  // it will be freed by that callback). The variable definitions we
+  // just throw away, as they are of no interest.
+  sqlite3ExprListDelete(pParse->db, X);
+}
+
 //////////////////////// The USE statement ////////////////////////////////////
 //
 cmd ::= use(X). {

query_classifier/qc_sqlite/sqlite-src-3110100/tool/mkkeywordhash.c

@@ -442,6 +442,7 @@ static Keyword aKeywordTable[] = {
   { "SET",              "TK_SET",          ALWAYS                 },
 #ifdef MAXSCALE
   { "START",            "TK_START",        ALWAYS                 },
+  { "STATEMENT",        "TK_STATEMENT",    ALWAYS                 },
   { "STATUS",           "TK_STATUS",       ALWAYS                 },
   { "STRAIGHT_JOIN",    "TK_STRAIGHT_JOIN",ALWAYS                 },
 #endif

query_classifier/test/maxscale.test

@@ -106,3 +106,6 @@ CALL p1((SELECT f1()), ?);
 
 # MXS-1829
 SELECT PREVIOUS VALUE FOR SEQ;
+
+# MXS-1874
+SET STATEMENT max_statement_time=30 FOR SELECT seq FROM seq_0_to_100000;