diff options
| author | unknown <guilhem@gbichot2> | 2003-10-03 20:07:08 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot2> | 2003-10-03 20:07:08 +0200 |
| commit | c78680b43f3d2320218d9851d70e73df9409c22c (patch) | |
| tree | 5c7bcc15a64ebbb6d3e7af9b70fb673670842c0c /mysql-test/r | |
| parent | 187ca485549b9e9e429ed978fb57d4017b44f2a9 (diff) | |
| download | mariadb-git-c78680b43f3d2320218d9851d70e73df9409c22c.tar.gz | |
Fix for a rpl_relayrotate failure.
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
mysql-test/r/rpl_relayrotate.result:
remove timeout which was too short for Valgrind
mysql-test/r/rpl_until.result:
updated error message
mysql-test/t/rpl_relayrotate.test:
removed timeout which was too short for Valgrind
sql/log_event.cc:
Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
believed that the relay log was corrupted. Fixed it by moving the test for
corruption to Start_log_event::exec_event().
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction (that was an old bug found by
chance :)
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl_relayrotate.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/rpl_until.result | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index 0ad61a7687e..802be911ad7 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -10,9 +10,9 @@ reset slave; start slave; stop slave; start slave; -select master_pos_wait('master-bin.001',3000,120)=-1; -master_pos_wait('master-bin.001',3000,120)=-1 -0 +select master_pos_wait('master-bin.001',3000)>=0; +master_pos_wait('master-bin.001',3000)>=0 +1 select * from t1 where a=8000; a 8000 diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result index 3dc3de8802d..ee5ceb28bd8 100644 --- a/mysql-test/r/rpl_until.result +++ b/mysql-test/r/rpl_until.result @@ -69,4 +69,4 @@ ERROR HY000: Wrong parameter or combination of parameters for START SLAVE UNTIL start slave sql_thread; start slave until master_log_file='master-bin.000001', master_log_pos=561; Warnings: -Note 1253 The slave was already running +Note 1253 Slave is already running |