diff options
| author | unknown <guilhem@mysql.com> | 2005-03-02 17:52:38 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-03-02 17:52:38 +0100 |
| commit | 5a5fc3433c06eb09708b24d2c94dbf60e20a0779 (patch) | |
| tree | 8449033fea5596d634679cd3191bf73ae3883346 /mysql-test/t/rpl_deadlock.test | |
| parent | 1972aa7d522529d6fd66ae8f7e685f0c9fcf56f5 (diff) | |
| download | mariadb-git-5a5fc3433c06eb09708b24d2c94dbf60e20a0779.tar.gz | |
Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge
mysql-test/r/drop_temp_table.result:
result update
mysql-test/r/mix_innodb_myisam_binlog.result:
result update
mysql-test/r/rpl000001.result:
result update
mysql-test/r/rpl_change_master.result:
result update
mysql-test/r/rpl_deadlock.result:
result update (merge)
mysql-test/t/rpl000001.test:
can't rely on GET_LOCK() to do slave synchro (use table lock instead)
mysql-test/t/rpl_change_master.test:
changing the test as we can't use GET_LOCK() for slave synchro
mysql-test/t/rpl_deadlock.test:
update (merge) binlog positions
mysql-test/t/rpl_get_lock.test:
comment
Diffstat (limited to 'mysql-test/t/rpl_deadlock.test')
| -rw-r--r-- | mysql-test/t/rpl_deadlock.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/rpl_deadlock.test b/mysql-test/t/rpl_deadlock.test index 82470e8ebd0..aa474f79963 100644 --- a/mysql-test/t/rpl_deadlock.test +++ b/mysql-test/t/rpl_deadlock.test @@ -68,7 +68,7 @@ show slave status; # 2) Test lock wait timeout stop slave; -change master to master_log_pos=401; # the BEGIN log event +change master to master_log_pos=534; # the BEGIN log event begin; select * from t2 for update; # hold lock start slave; @@ -89,7 +89,7 @@ set global max_relay_log_size=0; # This is really copy-paste of 2) of above stop slave; -change master to master_log_pos=401; +change master to master_log_pos=534; begin; select * from t2 for update; start slave; |