summaryrefslogtreecommitdiff
path: root/sql/rpl_utility.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-11-01 09:17:06 +0100
committerunknown <knielsen@knielsen-hq.org>2013-11-01 09:17:06 +0100
commitcb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (patch)
treedaff81c02baa6c2581d6abe3d746b8f35ee44f32 /sql/rpl_utility.cc
parentf4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff)
parent39df665a3332bd9bfb2529419f534a49cfac388c (diff)
downloadmariadb-git-cb86ce60b9bade5ae7712d8f3f74668208ee3fd2.tar.gz
Merge MDEV-4506: Parallel replication into 10.0-base.
Diffstat (limited to 'sql/rpl_utility.cc')
-rw-r--r--sql/rpl_utility.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index 22ee49b9bfb..377006253c9 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -1143,20 +1143,20 @@ bool Deferred_log_events::is_empty()
return array.elements == 0;
}
-bool Deferred_log_events::execute(Relay_log_info *rli)
+bool Deferred_log_events::execute(rpl_group_info *rgi)
{
bool res= false;
DBUG_ENTER("Deferred_log_events::execute");
- 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(rli);
+ res= ev->apply_event(rgi);
}
- rli->deferred_events_collecting= true;
+ rgi->deferred_events_collecting= true;
DBUG_RETURN(res);
}