diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2008-02-27 21:46:06 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2008-02-27 21:46:06 +0400 |
| commit | 83bcd5dfab83948353b2f30bfe497f0a92d31977 (patch) | |
| tree | f13c97ab1c6bbf24dc3fdd2734cd5b7fc1157126 /sql/slave.cc | |
| parent | eec647badb68d4f5a2a73471de6ffbdbfb13b0b8 (diff) | |
| download | mariadb-git-83bcd5dfab83948353b2f30bfe497f0a92d31977.tar.gz | |
BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
log-slave-updates and circul repl
After merge fixes.
mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt:
Rename: mysql-test/t/rpl_dual_pos_advance-slave.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Do not change connection if it was requested by caller (needed for
circular replication tests).
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Let include/wait_for_slave_sql_to_stop.inc know that we do not want to
change connection to slave.
sql/rpl_rli.cc:
After merge fix.
sql/rpl_rli.h:
After merge fix.
sql/slave.cc:
After merge fix.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 8bd28c903ae..b8d1fdfbb6b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1990,7 +1990,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) This tests if the position of the beginning of the current event hits the UNTIL barrier. */ - if (rli->until_condition != RELAY_LOG_INFO::UNTIL_NONE && + if (rli->until_condition != Relay_log_info::UNTIL_NONE && rli->is_until_satisfied((rli->is_in_group() || !ev->log_pos) ? rli->group_master_log_pos : ev->log_pos - ev->data_written)) @@ -2648,7 +2648,7 @@ Slave SQL thread aborted. Can't execute init_slave query"); do not want to wait for next event in this case. */ pthread_mutex_lock(&rli->data_lock); - if (rli->until_condition != RELAY_LOG_INFO::UNTIL_NONE && + if (rli->until_condition != Relay_log_info::UNTIL_NONE && rli->is_until_satisfied(rli->group_master_log_pos)) { char buf[22]; |