Merge branch '2.1' into develop

2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -77,3 +77,5 @@ ROLLBACK TO SAVEPOINT id;
 ROLLBACK WORK TO id;
 ROLLBACK TO id;
 RELEASE SAVEPOINT id;
+
+SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*';