From 8e3872f34e26149437952832330814abb4438772 Mon Sep 17 00:00:00 2001 From: unknown <monty@hundin.mysql.fi> Date: Thu, 19 Jul 2001 02:37:41 +0300 Subject: [PATCH] Fixed bad merge and fixed some wrong test cases mysql-test/t/rpl_magic.test: Added missing drop table mysql-test/t/rpl_mystery22.test: Added missing drop table mysql-test/t/rpl_sporadic_master.test: Fixed bad merge --- mysql-test/t/rpl_magic.test | 1 + mysql-test/t/rpl_mystery22.test | 1 + mysql-test/t/rpl_sporadic_master.test | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/t/rpl_magic.test b/mysql-test/t/rpl_magic.test index 18f1cea34a..376edc301d 100644 --- a/mysql-test/t/rpl_magic.test +++ b/mysql-test/t/rpl_magic.test @@ -28,3 +28,4 @@ disable_rpl_parse; select * from t1; connection slave; select * from t1; +drop table t1; diff --git a/mysql-test/t/rpl_mystery22.test b/mysql-test/t/rpl_mystery22.test index 3a48ef84dc..e987074697 100644 --- a/mysql-test/t/rpl_mystery22.test +++ b/mysql-test/t/rpl_mystery22.test @@ -1,5 +1,6 @@ # test case to make slave thread get ahead by 22 bytes +drop table if exists t1; source include/master-slave.inc; connection master; # first, cause a duplicate key problem on the slave diff --git a/mysql-test/t/rpl_sporadic_master.test b/mysql-test/t/rpl_sporadic_master.test index a8d953b94a..0487f86843 100644 --- a/mysql-test/t/rpl_sporadic_master.test +++ b/mysql-test/t/rpl_sporadic_master.test @@ -19,9 +19,7 @@ connection master; insert into t1 values (NULL),(NULL); flush logs; truncate table t1; -insert into t1 values (10),(NULL); -insert into t1 values (NULL),(NULL) -insert into t1 values (NULL),(NULL); +insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL); save_master_pos; connection slave; sync_with_master; -- 2.30.9