From 55271ba714724357d0697f9fb06ff063499e51ae Mon Sep 17 00:00:00 2001
From: unknown <knielsen@mysql.com>
Date: Fri, 10 Feb 2006 10:18:57 +0100
Subject: [PATCH] Fix missing test cleanup

---
 mysql-test/extra/rpl_tests/rpl_row_UUID.test | 2 ++
 mysql-test/r/rpl_row_UUID.result             | 2 ++
 mysql-test/r/rpl_row_trig001.result          | 1 +
 mysql-test/t/rpl_row_trig001.test            | 1 +
 4 files changed, 6 insertions(+)

diff --git a/mysql-test/extra/rpl_tests/rpl_row_UUID.test b/mysql-test/extra/rpl_tests/rpl_row_UUID.test
index 6bad362057a..2f203eb8963 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_UUID.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_UUID.test
@@ -63,7 +63,9 @@ connection master;
 # Let's cleanup
 
 DROP PROCEDURE test.p1;
+DROP FUNCTION test.fn1;
 DROP TABLE test.t1;
+DROP TABLE test.t2;
 
 # Let's compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file
diff --git a/mysql-test/r/rpl_row_UUID.result b/mysql-test/r/rpl_row_UUID.result
index 06c81e28ef6..36aa3c625bb 100644
--- a/mysql-test/r/rpl_row_UUID.result
+++ b/mysql-test/r/rpl_row_UUID.result
@@ -35,4 +35,6 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP PROCEDURE test.p1;
+DROP FUNCTION test.fn1;
 DROP TABLE test.t1;
+DROP TABLE test.t2;
diff --git a/mysql-test/r/rpl_row_trig001.result b/mysql-test/r/rpl_row_trig001.result
index dcbb05e4ab4..6665dc6d555 100644
--- a/mysql-test/r/rpl_row_trig001.result
+++ b/mysql-test/r/rpl_row_trig001.result
@@ -22,6 +22,7 @@ END//
 <End test section 2 (Tiggers & SP)>
 -----------------------------------
 DROP PROCEDURE test.p2;
+DROP PROCEDURE test.p3;
 DROP TRIGGER test.t2_ai;
 DROP TRIGGER test.t3_bi_t2;
 DROP TABLE test.t1;
diff --git a/mysql-test/t/rpl_row_trig001.test b/mysql-test/t/rpl_row_trig001.test
index e2f10ecf1fa..f2584933a32 100644
--- a/mysql-test/t/rpl_row_trig001.test
+++ b/mysql-test/t/rpl_row_trig001.test
@@ -81,6 +81,7 @@ let $message=<End test section 2 (Tiggers & SP)>;
 # First lets cleanup
 
 DROP PROCEDURE test.p2;
+DROP PROCEDURE test.p3;
 DROP TRIGGER test.t2_ai;
 DROP TRIGGER test.t3_bi_t2;
 DROP TABLE test.t1;