diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 4bf849c23c2fe2174016da630705a362f76d3922 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/slave.cc | |
| parent | f04cf03f75ffca0b99562c027c1c57340d375f66 (diff) | |
| parent | 62db6839b82d824567979ef3e05caccd67ed11ec (diff) | |
| download | mariadb-git-4bf849c23c2fe2174016da630705a362f76d3922.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.
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 e4fd07de44b..3a62785886d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2218,9 +2218,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" @@ -2963,7 +2961,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" |