diff options
| author | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-05 18:14:48 +0100 |
| commit | 44289ba6587b7a2151b4bd3aa7bd5f3b282454d5 (patch) | |
| tree | dbb4c85840636d99a9d0ab51a698645946f49c1e /mysql-test/t/rpl_until.test | |
| parent | e5ab70702c082c77401052f940b18b5f6d50a8c3 (diff) | |
| parent | 0db0b601abb3be2fdafa612583f4e03360876236 (diff) | |
| download | mariadb-git-44289ba6587b7a2151b4bd3aa7bd5f3b282454d5.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_until.test')
| -rw-r--r-- | mysql-test/t/rpl_until.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test index 9bc4ea4e7b1..4508fbea194 100644 --- a/mysql-test/t/rpl_until.test +++ b/mysql-test/t/rpl_until.test @@ -29,7 +29,7 @@ sleep 2; # here table should be still not deleted select * from t1; --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 33 # +--replace_column 1 # 9 # 23 # 33 # show slave status; # this should fail right after start @@ -59,9 +59,9 @@ stop slave; # this should stop immideately start slave until master_log_file='master-bin.000001', master_log_pos=561; -sleep 2; +--real-sleep 2; # here the sql slave thread should be stopped ---replace_result $MASTER_MYPORT MASTER_MYPORT +--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 --replace_column 1 # 9 # 23 # 33 # show slave status; |