diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-12-14 18:32:22 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-12-14 18:32:22 +0200 |
| commit | c00bfe59b3b7b3f4c6c866aa4f8d81b277452bb4 (patch) | |
| tree | 79f322d8853542fd99d6d35fcc14266afad722f2 /sql/slave.cc | |
| parent | f0ef41058c80f4c21a243f69ca8686956972e471 (diff) | |
| parent | efc5e0a8a6df0b7d02bcd5d3e646dd7ccebd021e (diff) | |
| download | mariadb-git-c00bfe59b3b7b3f4c6c866aa4f8d81b277452bb4.tar.gz | |
merging 5.0-bt -> 5.1-bt to local branch with bug@47210
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f6660e5a5c8..271b3635cf1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2258,9 +2258,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) hits the UNTIL barrier. */ 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)) + rli->is_until_satisfied(thd, ev)) { char buf[22]; sql_print_information("Slave SQL thread stopped because it reached its" @@ -3003,7 +3001,7 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME, */ pthread_mutex_lock(&rli->data_lock); if (rli->until_condition != Relay_log_info::UNTIL_NONE && - rli->is_until_satisfied(rli->group_master_log_pos)) + rli->is_until_satisfied(thd, NULL)) { char buf[22]; sql_print_information("Slave SQL thread stopped because it reached its" |