summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t/xa_recovery.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-12 11:18:51 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-31 19:28:58 +0200
commitd6d994bf42be0b855e3eb1c4d672a4871a186652 (patch)
treef59e6bc257a0d5a5e70920427750021396ac5c09 /mysql-test/suite/innodb/t/xa_recovery.test
parent143e771deef47e4afdd5d8dcdaddc424f919af83 (diff)
downloadmariadb-git-d6d994bf42be0b855e3eb1c4d672a4871a186652.tar.gz
remove two redundant *.inc files to restart a server
namely, restart_mysqld_with_option.inc and kill_and_restart_mysqld.inc - use restart_mysqld.inc instead. Also remove innodb_wl6501_crash_stripped.inc that wasn't used anywhere.
Diffstat (limited to 'mysql-test/suite/innodb/t/xa_recovery.test')
-rw-r--r--mysql-test/suite/innodb/t/xa_recovery.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/xa_recovery.test b/mysql-test/suite/innodb/t/xa_recovery.test
index f5c2b655545..957b758d05c 100644
--- a/mysql-test/suite/innodb/t/xa_recovery.test
+++ b/mysql-test/suite/innodb/t/xa_recovery.test
@@ -15,7 +15,8 @@ connect (con1,localhost,root);
XA START 'x'; UPDATE t1 set a=2; XA END 'x'; XA PREPARE 'x';
connection default;
---source include/kill_and_restart_mysqld.inc
+--let $shutdown_timeout=0
+--source include/restart_mysqld.inc
disconnect con1;
connect (con1,localhost,root);