diff options
| author | unknown <kent@mysql.com> | 2005-12-14 13:18:24 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-14 13:18:24 +0100 |
| commit | 479808bee04e3277027e5dc233a08cfd2d294a01 (patch) | |
| tree | 0d79531cb8940aa51ee43b2b10f6972f7d39bc1c /mysql-test/r | |
| parent | d051f628117eea491ae4cae6ad902588adaa8eaf (diff) | |
| parent | dbc27a622773f4787e47d81863f6d44f93bbaccb (diff) | |
| download | mariadb-git-479808bee04e3277027e5dc233a08cfd2d294a01.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl_relayrotate.result | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index b038e7b6a3e..20f19973d83 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -10,9 +10,6 @@ reset slave; start slave; stop slave; start slave; -select master_pos_wait('master-bin.001',3000)>=0; -master_pos_wait('master-bin.001',3000)>=0 -1 select max(a) from t1; max(a) 8000 |