Merge 5.5 into 10.1

MariaDB · Apr 26, 2019 · 1389c94 · 1389c94
2 parents 2ce5279 + 9264468
commit 1389c94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/r/xa_debug.result b/mysql-test/suite/innodb/r/xa_debug.result
@@ -201,6 +201,7 @@ xa start 'test1';
 insert into t1 values(1);
 xa end 'test1';
 xa prepare 'test1';
+FLUSH TABLES;
 xa recover;
 formatID	gtrid_length	bqual_length	data
 1	5	0	test1

diff --git a/mysql-test/suite/innodb/t/xa_debug.test b/mysql-test/suite/innodb/t/xa_debug.test
@@ -20,6 +20,7 @@ dec $trial;
 
 connection default;
 # Kill and restart the server.
+FLUSH TABLES;
 -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 -- shutdown_server 0
 -- source include/wait_until_disconnected.inc