diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
| commit | 72c20282db820b0b0818aea160a485bdca897eec (patch) | |
| tree | 3089e022d958990fc0a405a38ba43ae00c87103c /sql/rpl_rli.cc | |
| parent | 5e1d5d9bc0bf9ea776bffe6c4914a84be920c0b2 (diff) | |
| parent | 2acc01b3cfa27074f93016b893cda20fa0a3497f (diff) | |
| download | mariadb-git-72c20282db820b0b0818aea160a485bdca897eec.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 9036f810020..ac93f9640e8 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -886,11 +886,11 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, int cmp= strcmp(group_relay_log_name, event_relay_log_name); if (cmp < 0) { - group_relay_log_pos= event_relay_log_pos; + group_relay_log_pos= rgi->future_event_relay_log_pos; strmake_buf(group_relay_log_name, event_relay_log_name); notify_group_relay_log_name_update(); - } else if (cmp == 0 && group_relay_log_pos < event_relay_log_pos) - group_relay_log_pos= event_relay_log_pos; + } else if (cmp == 0 && group_relay_log_pos < rgi->future_event_relay_log_pos) + group_relay_log_pos= rgi->future_event_relay_log_pos; /* In the parallel case we need to update the master_log_name here, rather |