Merge branch '2.3' into develop

2019-04-12 13:23:49 +03:00
parent 382d485c2e 4131f09c16
commit c643f9bc8d
31 changed files with 625 additions and 243 deletions
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@ -121,3 +121,11 @@ SELECT X(coordinates), Y(coordinates), ST_X(coordinates), ST_Y(coordinates) FROM

 # MXS-2248
 SELECT curdate() + interval '60' day;
+
+# MXS-2431
+XA BEGIN 'xid';
+XA END 'xid';
+XA PREPARE 'xid';
+XA COMMIT 'xid';
+XA ROLLBACK 'xid'
+XA RECOVER 'xid';