summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Sandberg <sven@mysql.com>2008-07-15 12:01:54 +0200
committerSven Sandberg <sven@mysql.com>2008-07-15 12:01:54 +0200
commit679c7aca59265540128cdf93eac7e96acbd375cd (patch)
tree0271518c221f8d7b5064f499c43bd1cd7c097fe0
parent361458c6430dc5d4e59c976014b048dbad62a2fc (diff)
downloadmariadb-git-679c7aca59265540128cdf93eac7e96acbd375cd.tar.gz
BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
Post-push fix. The previous patch did 'reset master' at the wrong place.
-rw-r--r--mysql-test/include/master-slave-reset.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/include/master-slave-reset.inc b/mysql-test/include/master-slave-reset.inc
index 57fcc8f00cc..938eb2c074a 100644
--- a/mysql-test/include/master-slave-reset.inc
+++ b/mysql-test/include/master-slave-reset.inc
@@ -24,13 +24,13 @@ reset master;
reset slave;
--enable_query_log
connection slave;
---disable_query_log
-reset master;
---enable_query_log
reset slave;
# Clean up old test tables
--disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
--enable_warnings
+--disable_query_log
+reset master;
+--enable_query_log
start slave;
source include/wait_for_slave_to_start.inc;