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

into  mysql.com:/home/jimw/my/mysql-5.1-clean

mysql-test/r/rpl_drop_db.result

@@ -31,5 +31,5 @@ use test;
 select * from t1;
 n
 1234
-drop table t1;
+DROP DATABASE mysqltest1;
 stop slave;

mysql-test/r/rpl_multi_engine.result

@@ -363,3 +363,4 @@ id	hex(b1)	vc	bc	d	f	total	y	t
 select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
 id	hex(b1)	vc	bc	d	f	total	y	t
 DROP TABLE t1;
+DROP DATABASE mysqltest1;

mysql-test/t/rpl_drop_db.test

@@ -46,12 +46,13 @@ show tables;
 use test;
 select * from t1;
 
+system rm  var/master-data/mysqltest1/f1.txt;
 connection master;
-drop table t1;
+DROP DATABASE mysqltest1;
 sync_slave_with_master;
 
 #cleanup
 connection slave;
 stop slave;
-system rm -rf var/master-data/mysqltest1;
+#system rm -rf var/master-data/mysqltest1;
 

mysql-test/t/rpl_multi_engine.test

@@ -94,6 +94,8 @@ show create table t1;
 # cleanup
 connection master;
 DROP TABLE t1;
+# Need to drop mysqltest1 as well so other test will pass.
+DROP DATABASE mysqltest1;
 sync_slave_with_master;
 
 # End of 5.1 test case