Commit de70d4c9 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 05099790 3cd9ef4e

mysql-test/r/rpl_drop_db.result

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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