Merge branch '2.3' into develop

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

@@ -2122,10 +2122,10 @@ expr(A) ::= expr(X) BITAND|BITOR|LSHIFT|RSHIFT(OP) expr(Y).
 expr(A) ::= expr(X) PLUS|MINUS(OP) expr(Y).
                                         {spanBinaryExpr(&A,pParse,@OP,&X,&Y);}
 %ifdef MAXSCALE
-expr(A) ::= INTERVAL INTEGER(X) id. {
+expr(A) ::= INTERVAL expr(X) id. {
   // Here we could check that id is one of MICROSECOND, SECOND, MINUTE
   // HOUR, DAY, WEEK, etc.
-  spanExpr(&A, pParse, @X, &X);
+  A=X; // We simply ignore 'INTERVAL'
 }
 %endif
 expr(A) ::= expr(X) STAR|SLASH|REM(OP) expr(Y).

query_classifier/test/maxscale.test

@@ -118,3 +118,6 @@ SET STATEMENT max_statement_time=30 FOR UPDATE tbl SET a = 42;
 
 # MXS-2242
 SELECT X(coordinates), Y(coordinates), ST_X(coordinates), ST_Y(coordinates) FROM data;
+
+# MXS-2248
+SELECT curdate() + interval '60' day;