summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-09-03 17:11:18 +0200
committerSergei Golubchik <serg@mariadb.org>2015-09-03 17:11:18 +0200
commit8f6aac81d7363a3187dfa77cbc9d3141a7b2fc78 (patch)
treea73187b6904c545969f2a3d2bb19a0c972bb9198 /mysql-test/suite
parentce8d4d39acfabc254024ddec9a81cf2852aa6861 (diff)
downloadmariadb-git-8f6aac81d7363a3187dfa77cbc9d3141a7b2fc78.tar.gz
fix innodb.innodb_uninstall test to cleanup after itself
It caused the following main.innodb_load_xa to fail.
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/innodb/r/innodb_uninstall.result2
-rw-r--r--mysql-test/suite/innodb/t/innodb_uninstall.test4
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_uninstall.result b/mysql-test/suite/innodb/r/innodb_uninstall.result
index d0270c1cf3e..b1f618c5221 100644
--- a/mysql-test/suite/innodb/r/innodb_uninstall.result
+++ b/mysql-test/suite/innodb/r/innodb_uninstall.result
@@ -11,10 +11,10 @@ sleep(1)
0
Warnings:
Warning 1620 Plugin is busy and will be uninstalled on shutdown
-drop table t1;
install plugin innodb soname 'ha_innodb';
Warnings:
Warning 1105 Cannot enable tc-log at run-time. XA features of InnoDB are disabled
+drop table t1;
create table t2(a int not null primary key) engine=innodb;
insert into t2 values(1);
drop table t2;
diff --git a/mysql-test/suite/innodb/t/innodb_uninstall.test b/mysql-test/suite/innodb/t/innodb_uninstall.test
index 34fc8345a02..3cd02b23d8c 100644
--- a/mysql-test/suite/innodb/t/innodb_uninstall.test
+++ b/mysql-test/suite/innodb/t/innodb_uninstall.test
@@ -30,8 +30,6 @@ reap;
--source include/restart_mysqld.inc
-drop table t1;
-
#
# Another test that caused hang.
#
@@ -39,6 +37,8 @@ drop table t1;
connect (con1, localhost, root);
connection con1;
install plugin innodb soname 'ha_innodb';
+
+drop table t1;
create table t2(a int not null primary key) engine=innodb;
insert into t2 values(1);
drop table t2;