diff options
| author | unknown <mats@mysql.com> | 2005-07-13 14:15:23 +0200 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2005-07-13 14:15:23 +0200 |
| commit | 7310c3451f5a03ba38be4650b6dc6ae6bf396a8a (patch) | |
| tree | cc9ccd6d521d909181e956ba487f14d397521604 /mysql-test/t/rpl_deadlock.test | |
| parent | 52adc14e49d3954acf772cfe3243ceaa792dfd78 (diff) | |
| parent | ecd1ea93a7ec01dddfc11a2a3b5c69f780965837 (diff) | |
| download | mariadb-git-7310c3451f5a03ba38be4650b6dc6ae6bf396a8a.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/bXXX-mysql-5.0
mysql-test/r/rpl_deadlock.result:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_deadlock.test')
| -rw-r--r-- | mysql-test/t/rpl_deadlock.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index 3bcbb1d4567..eb4c5c33714 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -107,5 +107,5 @@ select * from t2; show slave status; connection master; -drop table t1,t2; +drop table t1,t2,t3,t4; sync_slave_with_master; |