diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:36:20 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:36:20 +0200 |
| commit | ba4b937af2e3c9118071b1279bc39b6febca73a9 (patch) | |
| tree | ad2cf72470e8a031ae5ce0b3f7568cca0faf5340 /sql/rpl_utility.cc | |
| parent | 6d5f237e091ca7aa4fdd52c186af11fffc80b1c2 (diff) | |
| download | mariadb-git-ba4b937af2e3c9118071b1279bc39b6febca73a9.tar.gz | |
MDEV-4506: Parallel replication: Intermediate commit
Move the deferred event stuff from Relay_log_info to rpl_group_info
to make it thread safe for parallel replication.
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index cce8ef99fef..f734b95edc1 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -1146,18 +1146,17 @@ bool Deferred_log_events::is_empty() bool Deferred_log_events::execute(struct rpl_group_info *rgi) { bool res= false; - Relay_log_info *rli= rgi->rli; - DBUG_ASSERT(rli->deferred_events_collecting); + DBUG_ASSERT(rgi->deferred_events_collecting); - rli->deferred_events_collecting= false; + rgi->deferred_events_collecting= false; for (uint i= 0; !res && i < array.elements; i++) { Log_event *ev= (* (Log_event **) dynamic_array_ptr(&array, i)); res= ev->apply_event(rgi); } - rli->deferred_events_collecting= true; + rgi->deferred_events_collecting= true; return res; } |