bk commit into 5.1 tree (knielsen:1.2135)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2135 06/02/10 10:18:57 knielsen@stripped +4 -0
  Fix missing test cleanup

  mysql-test/r/rpl_row_UUID.result
    1.2 06/02/10 10:18:37 knielsen@stripped +2 -0
    Fix missing test cleanup

  mysql-test/t/rpl_row_trig001.test
    1.2 06/02/10 10:18:36 knielsen@stripped +1 -0
    Fix missing test cleanup

  mysql-test/r/rpl_row_trig001.result
    1.2 06/02/10 10:18:36 knielsen@stripped +1 -0
    Fix missing test cleanup

  mysql-test/extra/rpl_tests/rpl_row_UUID.test
    1.2 06/02/10 10:18:36 knielsen@stripped +2 -0
    Fix missing test cleanup

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-sp-destruct

--- 1.1/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2006-02-10 10:18:36 +01:00
@@ -63,7 +63,9 @@
 # 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

--- 1.1/mysql-test/r/rpl_row_UUID.result	2005-12-22 06:34:52 +01:00
+++ 1.2/mysql-test/r/rpl_row_UUID.result	2006-02-10 10:18:37 +01:00
@@ -35,4 +35,6 @@
   PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP PROCEDURE test.p1;
+DROP FUNCTION test.fn1;
 DROP TABLE test.t1;
+DROP TABLE test.t2;

--- 1.1/mysql-test/r/rpl_row_trig001.result	2005-12-22 06:34:57 +01:00
+++ 1.2/mysql-test/r/rpl_row_trig001.result	2006-02-10 10:18:36 +01:00
@@ -22,6 +22,7 @@
 <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;

--- 1.1/mysql-test/t/rpl_row_trig001.test	2005-12-22 06:35:05 +01:00
+++ 1.2/mysql-test/t/rpl_row_trig001.test	2006-02-10 10:18:36 +01:00
@@ -81,6 +81,7 @@
 # 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;