From d7282f136b898b66ca3bafcd5eeceee30aab3c0f Mon Sep 17 00:00:00 2001
From: unknown <tsmith@sita.local>
Date: Tue, 3 Jul 2007 19:51:32 -0600
Subject: [PATCH] rpl_misc_functions.result, rpl_misc_functions.test:   work
 around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE
 before DROP PROCEDURE in cleanup

mysql-test/suite/rpl/r/rpl_misc_functions.result:
  work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
---
 mysql-test/suite/rpl/r/rpl_misc_functions.result | 2 +-
 mysql-test/suite/rpl/t/rpl_misc_functions.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result
index ca7403316b1..94aa1bb61a7 100644
--- a/mysql-test/suite/rpl/r/rpl_misc_functions.result
+++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result
@@ -48,7 +48,7 @@ where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ;
 SELECT @aux;
 @aux
 12
+DROP TABLE t1, t1_slave;
 DROP PROCEDURE test_replication_sp1;
 DROP PROCEDURE test_replication_sp2;
 DROP FUNCTION test_replication_sf;
-DROP TABLE t1, t1_slave;
diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test
index b87fff919b2..d56402cbe76 100644
--- a/mysql-test/suite/rpl/t/rpl_misc_functions.test
+++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test
@@ -104,10 +104,10 @@ if (`SELECT @aux <> 12 OR @aux IS NULL`)
 
 # Cleanup
 connection master;
+DROP TABLE t1, t1_slave;
 DROP PROCEDURE test_replication_sp1;
 DROP PROCEDURE test_replication_sp2;
 DROP FUNCTION test_replication_sf;
-DROP TABLE t1, t1_slave;
 --sync_slave_with_master
 
 
-- 
2.30.9