Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

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

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;

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;

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;