diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-10-30 07:52:30 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-10-30 07:52:30 +0100 |
| commit | 9c8da4ed762a4ad092e23cc07c34212320341ac1 (patch) | |
| tree | ef6cdb1098f81833a57d7ce6d4d71e6a0abe79cf /sql/rpl_rli.cc | |
| parent | f2799c68286c5742b5dbdeb65942494ff2ba38af (diff) | |
| download | mariadb-git-9c8da4ed762a4ad092e23cc07c34212320341ac1.tar.gz | |
MDEV-5196: Server hangs or assertion `!thd->wait_for_commit_ptr' fails on MASTER_POS_WAIT with slave-parallel-threads > 0
Fix a couple of issues in MDEV-4506, Parallel replication:
- Missing mysql_cond_signal(), which could cause hangs.
- Fix incorrect update of old-style replication position.
- Change assertion to error handling (can trigger on manipulated/
corrupt binlog).
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index b558f2db64c..e0fd8caa90e 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -902,8 +902,9 @@ void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos, { strcpy(group_master_log_name, rgi->future_event_master_log_name); notify_group_master_log_name_update(); + group_master_log_pos= log_pos; } - if (group_master_log_pos < log_pos) + else if (group_master_log_pos < log_pos) group_master_log_pos= log_pos; } } |