Merge branch '2.2' into 2.3

This commit is contained in:
Johan Wikman 2019-01-09 09:13:59 +02:00
commit 78ea12b4c1
3 changed files with 6 additions and 2 deletions

View File

@ -10,6 +10,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
## Bug fixes
* [MXS-2248](https://jira.mariadb.org/browse/MXS-2248) INSERT sent to all nodes
* [MXS-2242](https://jira.mariadb.org/browse/MXS-2242) MaxScale does not recognize builtin read-only functions
* [MXS-2238](https://jira.mariadb.org/browse/MXS-2238) MaxScale fails to send large CDC schemas
* [MXS-2234](https://jira.mariadb.org/browse/MXS-2234) Add extra info to log when MaxScale loads persisted configuration files

View File

@ -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).

View File

@ -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;