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_parallel.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_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 844c3a3c4f8..d5020dd4cba 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -94,7 +94,6 @@ handle_queued_pos_update(THD *thd, rpl_parallel_thread::queued_event *qev) if (cmp < 0) { strcpy(rli->group_master_log_name, qev->future_event_master_log_name); - rli->notify_group_master_log_name_update(); rli->group_master_log_pos= qev->future_event_master_log_pos; } else if (cmp == 0 @@ -2110,6 +2109,7 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev, { memcpy(rli->future_event_master_log_name, rev->new_log_ident, rev->ident_len+1); + rli->notify_group_master_log_name_update(); } } |