Skip to content

M
MariaDB
Commit 1389c94b authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 5.5 into 10.1

parents 2ce52790 92644688
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
mysql-test/suite/innodb/r/xa_debug.result
View file @ 1389c94b
...@@ -201,6 +201,7 @@ xa start 'test1'; ...@@ -201,6 +201,7 @@ xa start 'test1';
insert into t1 values(1); insert into t1 values(1);
xa end 'test1'; xa end 'test1';
xa prepare 'test1'; xa prepare 'test1';
FLUSH TABLES;
xa recover; xa recover;
formatID gtrid_length bqual_length data formatID gtrid_length bqual_length data
1 5 0 test1 1 5 0 test1
......
mysql-test/suite/innodb/t/xa_debug.test
View file @ 1389c94b
...@@ -20,6 +20,7 @@ dec $trial; ...@@ -20,6 +20,7 @@ dec $trial;
connection default; connection default;
# Kill and restart the server. # Kill and restart the server.
FLUSH TABLES;
-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-- shutdown_server 0 -- shutdown_server 0
-- source include/wait_until_disconnected.inc -- source include/wait_until_disconnected.inc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7