Merge branch '2.1.7' into develop-2.1-merge

2017-09-12 11:08:02 +03:00
parent 65066ae126 2a4bfc31ec
commit 02b9e0a01d
28 changed files with 367 additions and 90 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -79,3 +79,8 @@ ROLLBACK TO id;
 RELEASE SAVEPOINT id;

 SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*';
+
+select * from db1.t1 union select * from db2.t2;
+
+# Names is a keyword as well
+select names from t;