summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-05-22 22:29:44 +0200
committerunknown <guilhem@mysql.com>2003-05-22 22:29:44 +0200
commit46c730e62cd02a6e68aded98e03d633c14e61f3b (patch)
tree673efda01b3fdde34431f5c4563dd9379b065446 /mysql-test
parent1ad3551835ba4096034277d841be6575302f8957 (diff)
downloadmariadb-git-46c730e62cd02a6e68aded98e03d633c14e61f3b.tar.gz
Cleaning DROP TABLE which is important if the tests are run in a certain order.
This is because rpl_relayrotate.test uses InnoDB. Example of a failing sequence: rpl_relayrotate.test repl_user_variables.test rpl_relayrotate.test Explaination in the files. Btw all other tests which use InnoDB (innodb*.test) already have this final DROP TABLE. Removed a wrong comment of mine. mysql-test/r/rpl_relayrotate.result: result update mysql-test/t/rpl_relayrotate.test: cleaning DROP TABLE which is important if the tests are run in a certain order.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_relayrotate.result1
-rw-r--r--mysql-test/t/rpl_relayrotate.test14
2 files changed, 12 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result
index 45f425a3532..0ad61a7687e 100644
--- a/mysql-test/r/rpl_relayrotate.result
+++ b/mysql-test/r/rpl_relayrotate.result
@@ -16,3 +16,4 @@ master_pos_wait('master-bin.001',3000,120)=-1
select * from t1 where a=8000;
a
8000
+drop table t1;
diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test
index 4c330b8c9a2..09cf7cbb741 100644
--- a/mysql-test/t/rpl_relayrotate.test
+++ b/mysql-test/t/rpl_relayrotate.test
@@ -56,6 +56,14 @@ start slave;
# Detect this with timeout.
select master_pos_wait('master-bin.001',3000,120)=-1;
select * from t1 where a=8000;
-# Note that the simple fact to have less than around 30 slave's binlogs
-# (the slave is started with --log-slave-updates) is already
-# a proof that the transaction was not properly resumed.
+
+# The following DROP is a very important cleaning task:
+# imagine the next test is run with --skip-innodb: it will do
+# DROP TABLE IF EXISTS t1; but this will delete the frm and leave
+# some data in the InnoDB datafile (because at that time mysqld
+# does not know about InnoDB : --skip-innodb). So if later in the
+# test suite a test wants to create an InnoDB table called t1, it
+# will fail with
+# InnoDB: Error: table t1 already exists in InnoDB internal
+# InnoDB: data dictionary. Have you deleted the .frm file etc
+drop table t1;