diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-26 16:41:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-26 16:41:59 +0300 |
| commit | 1389c94b3c33793a3c7f56b5e238e29e7c71d998 (patch) | |
| tree | 467060d0c8f16f771a1977c9d347656e03418d6f /mysql-test | |
| parent | 2ce52790ffc72c4a4d3670ebf67c6655450620f2 (diff) | |
| parent | 926446880f937568eaae9a9671193d9d652f7bf9 (diff) | |
| download | mariadb-git-1389c94b3c33793a3c7f56b5e238e29e7c71d998.tar.gz | |
Merge 5.5 into 10.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/r/xa_debug.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/xa_debug.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/xa_debug.result b/mysql-test/suite/innodb/r/xa_debug.result index 43a3b299468..f1fd3f14220 100644 --- 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 index 5724891bb65..5e38ba1124b 100644 --- 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 |