diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-11 12:01:48 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-11 12:01:48 +0200 |
| commit | df9b8aee5879fa2b6e47ed02fff4e6fbb45f720f (patch) | |
| tree | 377cf5b9b7dd2068e6cee37dbc32222d79ddc29d /sql/rpl_rli.cc | |
| parent | 6f302d9f6cb1eafc018d9ca010dc40f15cb19390 (diff) | |
| parent | 51eaa7fe53eb017ffb3f4dc2f318cb0511b7cd26 (diff) | |
| download | mariadb-git-df9b8aee5879fa2b6e47ed02fff4e6fbb45f720f.tar.gz | |
Merge MDEV-8193 into 10.1
Conflicts:
sql/rpl_rli.cc
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 078838f9ef2..7453f57e64c 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -993,7 +993,6 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, if (cmp < 0) { strcpy(group_master_log_name, rgi->future_event_master_log_name); - notify_group_master_log_name_update(); group_master_log_pos= log_pos; } else if (group_master_log_pos < log_pos) @@ -1209,7 +1208,8 @@ bool Relay_log_info::is_until_satisfied(my_off_t master_beg_pos) if (until_condition == UNTIL_MASTER_POS) { - log_name= group_master_log_name; + log_name= (mi->using_parallel() ? + future_event_master_log_name : group_master_log_name); log_pos= master_beg_pos; } else |