Merge branch '2.3' into develop

2019-01-09 09:15:30 +02:00
parent 5a698be45c 78ea12b4c1
commit 269ab712bc
3 changed files with 6 additions and 2 deletions
--- a/query_classifier/test/maxscale.test
+++ b/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;