Bug#32754 - InnoDB tests do not prepare or clean up correctly

Some test cases were missing preparation to deal with failed
predecessor test cases.

Added preparation (drop table if exists) to some test cases.

mysql-test/include/innodb_rollback_on_timeout.inc

@@ -2,6 +2,10 @@
 # Bug #24200: Provide backwards compatibility mode for 4.x "rollback on
 # transaction timeout"
 #
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
 show variables like 'innodb_rollback_on_timeout';
 create table t1 (a int unsigned not null primary key) engine = innodb;
 insert into t1 values (1);

mysql-test/r/innodb-semi-consistent.result

@@ -1,3 +1,4 @@
+drop table if exists t1;
 set session transaction isolation level read committed;
 create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
 insert into t1 values (1),(2),(3),(4),(5),(6),(7);

mysql-test/r/innodb-ucs2.result

@@ -1,3 +1,4 @@
+drop table if exists t1, t2;
 create table t1 (
 a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))
 ) character set utf8 engine = innodb;

mysql-test/r/innodb_mysql.result

@@ -389,6 +389,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 name	dept
 DROP TABLE t1;
+drop table if exists t1;
 show variables like 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	OFF
@@ -451,6 +452,7 @@ tes	1234
 drop table test;
 set global query_cache_type=@save_qcache_type;
 set global query_cache_size=@save_qcache_size;
+drop table if exists t1;
 show variables like 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	OFF
@@ -775,6 +777,7 @@ EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	128	Using filesort
 DROP TABLE t1;
+drop table if exists t1;
 show variables like 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	OFF

mysql-test/r/innodb_timeout_rollback.result

@@ -1,3 +1,4 @@
+drop table if exists t1;
 show variables like 'innodb_rollback_on_timeout';
 Variable_name	Value
 innodb_rollback_on_timeout	ON

mysql-test/t/innodb-semi-consistent.test

@@ -1,6 +1,10 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
 # basic tests of semi-consistent reads
 
 connect (a,localhost,root,,);

mysql-test/t/innodb-ucs2.test

@@ -1,6 +1,10 @@
 -- source include/have_innodb.inc
 -- source include/have_ucs2.inc
 
+--disable_warnings
+drop table if exists t1, t2;
+--enable_warnings
+
 #
 # BUG 14056 Column prefix index on UTF-8 primary key column causes: Can't find record..
 #