diff options
| author | unknown <serg@serg.mylan> | 2003-11-25 18:26:53 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-25 18:26:53 +0100 |
| commit | a1c0636d089a3f54c480be8326d73d2dad93b33c (patch) | |
| tree | d0d188167fd29e1446df7d81a039d931b931fa08 /mysql-test | |
| parent | ab57ede75776c79eb5a6dca9dc6fd6760b7a3edf (diff) | |
| parent | ea280fd3ff1ab19370fba66e7f001351f8a23413 (diff) | |
| download | mariadb-git-a1c0636d089a3f54c480be8326d73d2dad93b33c.tar.gz | |
merged
Docs/Makefile.am:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysys/my_getopt.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/rpl_change_master.result:
merged - ul
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/rpl_change_master.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 94f044d5413..e6452b5b619 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -4,11 +4,11 @@ connection slave; select get_lock("a",5); connection master; create table t1(n int); -insert into t1 values(1+get_lock("a",10)*0); +insert into t1 values(1+get_lock("a",15)*0); insert into t1 values(2); save_master_pos; connection slave; -sleep 3; # can't sync_with_master as we should be blocked +--real_sleep 3; # can't sync_with_master as we should be blocked stop slave; select * from t1; --replace_result $MASTER_MYPORT MASTER_MYPORT |