diff options
| author | unknown <jimw@mysql.com> | 2006-01-05 16:50:46 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-01-05 16:50:46 -0800 |
| commit | de70d4c90a101bf2b22809522804db8cb70d04db (patch) | |
| tree | cbb6fb1eab98b85f3ddb44783f1c0fddde014ac4 | |
| parent | 05099790b3c604d0a46463dabc1c08362c88a807 (diff) | |
| parent | 3cd9ef4eb0c32d1ea7befbb0a8a7b71015454513 (diff) | |
| download | mariadb-git-de70d4c90a101bf2b22809522804db8cb70d04db.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/home/jimw/my/mysql-5.1-clean
| -rw-r--r-- | mysql-test/r/rpl_drop_db.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_multi_engine.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_drop_db.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_multi_engine.test | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_drop_db.result b/mysql-test/r/rpl_drop_db.result index ce9d39e87f6..3a35dc266b6 100644 --- a/mysql-test/r/rpl_drop_db.result +++ b/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; diff --git a/mysql-test/r/rpl_multi_engine.result b/mysql-test/r/rpl_multi_engine.result index 27482eae6d9..0492231be37 100644 --- a/mysql-test/r/rpl_multi_engine.result +++ b/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; diff --git a/mysql-test/t/rpl_drop_db.test b/mysql-test/t/rpl_drop_db.test index 98afc6e3d02..548009b758e 100644 --- a/mysql-test/t/rpl_drop_db.test +++ b/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; diff --git a/mysql-test/t/rpl_multi_engine.test b/mysql-test/t/rpl_multi_engine.test index b0879757468..356237d1584 100644 --- a/mysql-test/t/rpl_multi_engine.test +++ b/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 |