From e5bc5128bcc838c62200c27d4e83f0a4adc4c6e3 Mon Sep 17 00:00:00 2001
From: Sven Sandberg <sven@mysql.com>
Date: Tue, 15 Jul 2008 12:01:54 +0200
Subject: [PATCH] BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on
 pushbuild Post-push fix. The previous patch did 'reset master' at the wrong
 place.

mysql-test/include/master-slave-reset.inc:
  reset master must be called *after* the tables have been dropped.
  The purpose of reset master is to get rid of 'drop table' from
  the slave's binlog.
---
 mysql-test/include/master-slave-reset.inc | 6 +++---
 1 file 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;