diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 12:53:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 12:53:23 +0200 |
| commit | 7bc1d892038f170f90448a08292153bc2456f504 (patch) | |
| tree | 28d4cff53bc2ea27de7b3461c91aa1c5e7f496b3 /mysql-test/t/rpl_deadlock.test | |
| parent | 6eedec6889e8e7c080be4f6ff896a9b3e4c6cf6d (diff) | |
| parent | 126e351cde084ae36d9e803c740bf07c7054c577 (diff) | |
| download | mariadb-git-7bc1d892038f170f90448a08292153bc2456f504.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/rpl_flush_log_loop.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/flush.test:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
mysql-test/t/rpl_change_master.test:
Manual merge
mysql-test/t/rpl_until.test:
Manual merge
Diffstat (limited to 'mysql-test/t/rpl_deadlock.test')
| -rw-r--r-- | mysql-test/t/rpl_deadlock.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index 3bcbb1d4567..fa17cfe0308 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -58,7 +58,7 @@ while ($1) enable_query_log; select * from t1 for update; start slave; ---sleep 3; # hope that slave is blocked now +--sleep 3 # hope that slave is blocked now insert into t2 values(22); # provoke deadlock, slave should be victim commit; sync_with_master; @@ -76,7 +76,7 @@ change master to master_log_pos=532; # the BEGIN log event begin; select * from t2 for update; # hold lock start slave; ---sleep 10; # slave should have blocked, and be retrying +--sleep 10 # slave should have blocked, and be retrying commit; sync_with_master; select * from t1; # check that slave succeeded finally @@ -97,7 +97,7 @@ change master to master_log_pos=532; begin; select * from t2 for update; start slave; ---sleep 10; +--sleep 10 commit; sync_with_master; select * from t1; |