Merge branch '2.2' into 2.3

2018-12-04 11:23:31 +02:00
parent 1f495dec99 87d2a45b20
commit 1a78f2ffbb
3 changed files with 33 additions and 4 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -112,3 +112,6 @@ SET STATEMENT max_statement_time=30 FOR SELECT seq FROM seq_0_to_100000;

 # MXS-1935
 PREPARE a FROM @sql;
+
+# MXS-2207
+SET STATEMENT max_statement_time=30 FOR UPDATE tbl SET a = 42;