From 8784957e14fee127c0b8ca094031f2b74e55e359 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Nov 2007 09:25:45 +0100 Subject: [PATCH] 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: Bug#32754 - InnoDB tests do not prepare or clean up correctly Added preparation (drop table if exists). mysql-test/r/innodb-semi-consistent.result: Bug#32754 - InnoDB tests do not prepare or clean up correctly Fixed test result. mysql-test/r/innodb-ucs2.result: Bug#32754 - InnoDB tests do not prepare or clean up correctly Fixed test result. mysql-test/r/innodb_mysql.result: Bug#32754 - InnoDB tests do not prepare or clean up correctly Fixed test result. mysql-test/r/innodb_timeout_rollback.result: Bug#32754 - InnoDB tests do not prepare or clean up correctly Fixed test result. mysql-test/t/innodb-semi-consistent.test: Bug#32754 - InnoDB tests do not prepare or clean up correctly Added preparation (drop table if exists). mysql-test/t/innodb-ucs2.test: Bug#32754 - InnoDB tests do not prepare or clean up correctly Added preparation (drop table if exists). --- mysql-test/include/innodb_rollback_on_timeout.inc | 4 ++++ mysql-test/r/innodb-semi-consistent.result | 1 + mysql-test/r/innodb-ucs2.result | 1 + mysql-test/r/innodb_mysql.result | 3 +++ mysql-test/r/innodb_timeout_rollback.result | 1 + mysql-test/t/innodb-semi-consistent.test | 4 ++++ mysql-test/t/innodb-ucs2.test | 4 ++++ 7 files changed, 18 insertions(+) diff --git a/mysql-test/include/innodb_rollback_on_timeout.inc b/mysql-test/include/innodb_rollback_on_timeout.inc index 73c7374c79e..6be47397e4b 100644 --- a/mysql-test/include/innodb_rollback_on_timeout.inc +++ b/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); diff --git a/mysql-test/r/innodb-semi-consistent.result b/mysql-test/r/innodb-semi-consistent.result index ad7b70d0497..f1139390f20 100644 --- a/mysql-test/r/innodb-semi-consistent.result +++ b/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); diff --git a/mysql-test/r/innodb-ucs2.result b/mysql-test/r/innodb-ucs2.result index a1c73c912b2..b6bff7d5f42 100644 --- a/mysql-test/r/innodb-ucs2.result +++ b/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; diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 3f9e9b404f0..75bca880305 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/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 diff --git a/mysql-test/r/innodb_timeout_rollback.result b/mysql-test/r/innodb_timeout_rollback.result index b25a2bbd815..e2da6ba8af7 100644 --- a/mysql-test/r/innodb_timeout_rollback.result +++ b/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 diff --git a/mysql-test/t/innodb-semi-consistent.test b/mysql-test/t/innodb-semi-consistent.test index 7a9231b508f..c33126b93ff 100644 --- a/mysql-test/t/innodb-semi-consistent.test +++ b/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,,); diff --git a/mysql-test/t/innodb-ucs2.test b/mysql-test/t/innodb-ucs2.test index 6647a9d0845..7b91ef37d3f 100644 --- a/mysql-test/t/innodb-ucs2.test +++ b/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.. #