summaryrefslogtreecommitdiff
path: root/sql/rpl_parallel.cc
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2015-09-11 10:51:56 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2015-09-11 10:51:56 +0200
commit51eaa7fe53eb017ffb3f4dc2f318cb0511b7cd26 (patch)
tree48a3c4a39f74607b083594e3de78e190dc10dd17 /sql/rpl_parallel.cc
parent09bfaf3a13dabad936198633b968451c17d409b2 (diff)
downloadmariadb-git-51eaa7fe53eb017ffb3f4dc2f318cb0511b7cd26.tar.gz
MDEV-8193: UNTIL clause in START SLAVE is sporadically disobeyed by parallel replication
The code was using the wrong variable when comparing the binlog name for the UNTIL position. This could cause the comparison to fail after binlog rotation, in turn causing the UNTIL clause to not trigger slave stop.
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r--sql/rpl_parallel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc
index df6fc92e9bd..cc5da77303c 100644
--- a/sql/rpl_parallel.cc
+++ b/sql/rpl_parallel.cc
@@ -95,7 +95,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
@@ -2065,6 +2064,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();
}
}