Merge branch '2.2' into develop

2018-04-13 14:53:00 +03:00
parent 3c8d3feff9 3d8d2beaaa
commit ec33fcf87d
19 changed files with 457 additions and 80 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -100,3 +100,6 @@ SELECT '2005-01-01' - INTERVAL 1 SECOND;

 # MXS-1730
 SELECT id as engine FROM users WHERE id = 1;
+
+# MXS-1787
+CALL p1((SELECT f1()), ?);