Merge branch '2.2' into develop

2018-05-18 13:40:27 +03:00
parent df7c46fbdd 7c0ea3220c
commit 765806a633
7 changed files with 29 additions and 11 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -106,3 +106,6 @@ CALL p1((SELECT f1()), ?);

 # MXS-1829
 SELECT PREVIOUS VALUE FOR SEQ;
+
+# MXS-1874
+SET STATEMENT max_statement_time=30 FOR SELECT seq FROM seq_0_to_100000;