summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskozlov/ksm@mysql.com/virtop.(none) <>2008-03-01 00:05:23 +0300
committerskozlov/ksm@mysql.com/virtop.(none) <>2008-03-01 00:05:23 +0300
commite9b8538fdc4bec7b7e8a578b21646a8cefde341a (patch)
tree7f591f684e4209bffb409aa96cf4d700da64b590
parent0771579b82af1e0d92e799b8754930b8645b5724 (diff)
downloadmariadb-git-e9b8538fdc4bec7b7e8a578b21646a8cefde341a.tar.gz
WL#4091, enable rpl_flushlog_loop.test and fix for rpl_drop_temp.test
-rw-r--r--mysql-test/suite/rpl/t/disabled.def1
-rw-r--r--mysql-test/suite/rpl/t/rpl_drop_temp.test2
-rw-r--r--mysql-test/suite/rpl/t/rpl_flushlog_loop.test2
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index 53868e070e4..20c3ccf0486 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -11,7 +11,6 @@
##############################################################################
rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
-rpl_flushlog_loop : WL#4091 skozlov: temporary disabled because of failures on some platforms
rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.
rpl_innodb_bug28430 : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table)
rpl_view : Bug#32654: rpl_view.test fails randomly
diff --git a/mysql-test/suite/rpl/t/rpl_drop_temp.test b/mysql-test/suite/rpl/t/rpl_drop_temp.test
index 51c5472beb8..f06b0951469 100644
--- a/mysql-test/suite/rpl/t/rpl_drop_temp.test
+++ b/mysql-test/suite/rpl/t/rpl_drop_temp.test
@@ -23,7 +23,7 @@ connection master1;
let $wait_binlog_event= DROP;
source include/wait_for_binlog_event.inc;
-connection slave;
+sync_slave_with_master;
show status like 'Slave_open_temp_tables';
# Cleanup
connection default;
diff --git a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test
index ab1be9d297b..079048bd24d 100644
--- a/mysql-test/suite/rpl/t/rpl_flushlog_loop.test
+++ b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test
@@ -42,6 +42,8 @@ let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%
--disable_query_log
CREATE TABLE t1 (a INT KEY) ENGINE= MyISAM;
+sync_slave_with_master;
+connection master;
INSERT INTO t1 VALUE(1);
--enable_query_log
FLUSH LOGS;