summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-08-14 14:59:43 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-08-14 14:59:43 -0400
commitc6a0cbdac6dbb7134164732bf7a6096d82e1f0a1 (patch)
treee1cb5f078503d3b0fe6530bc0f2bdfb6568140c6 /mysql-test/t
parent5cf737c07a959fa3f03fb3c6d0a71ac442e59073 (diff)
parentfe757e006c676bc1cfb713f26fbd43e608531458 (diff)
downloadmariadb-git-c6a0cbdac6dbb7134164732bf7a6096d82e1f0a1.tar.gz
Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.21
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/innodb_load_xa_with_wsrep.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_load_xa_with_wsrep.test b/mysql-test/t/innodb_load_xa_with_wsrep.test
index 413faf54864..6755d209a02 100644
--- a/mysql-test/t/innodb_load_xa_with_wsrep.test
+++ b/mysql-test/t/innodb_load_xa_with_wsrep.test
@@ -17,3 +17,6 @@ commit;
--source include/show_binlog_events.inc
drop table t1;
uninstall plugin innodb;
+
+--source include/restart_mysqld.inc
+