diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-11 12:03:04 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-09-11 12:03:04 +0200 |
| commit | 244f043e6ec5a6d1500593b999baf85838ccfa96 (patch) | |
| tree | d23d0f14ca4fccbe30e8c29b20362cca2e1dc03e /sql/rpl_rli.cc | |
| parent | 0ce0b88080fd39f6841206b64d8723af9779e849 (diff) | |
| parent | 51eaa7fe53eb017ffb3f4dc2f318cb0511b7cd26 (diff) | |
| download | mariadb-git-244f043e6ec5a6d1500593b999baf85838ccfa96.tar.gz | |
Merge MDEV-8193 into 10.0
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 3207c858b20..8a2a55fcde0 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -996,7 +996,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) @@ -1218,7 +1217,8 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev) if (ev && ev->server_id == (uint32) global_system_variables.server_id && !replicate_same_server_id) DBUG_RETURN(FALSE); - log_name= group_master_log_name; + log_name= (opt_slave_parallel_threads > 0 ? + future_event_master_log_name : group_master_log_name); log_pos= ((!ev)? group_master_log_pos : (get_flag(IN_TRANSACTION) || !ev->log_pos) ? group_master_log_pos : ev->log_pos - ev->data_written); |