diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /sql/rpl_utility.cc | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index db47c3c164a..614f18a6dff 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -1186,7 +1186,7 @@ bool Deferred_log_events::is_empty() bool Deferred_log_events::execute(Relay_log_info *rli) { bool res= false; - + DBUG_ENTER("Deferred_log_events::execute"); DBUG_ASSERT(rli->deferred_events_collecting); rli->deferred_events_collecting= false; @@ -1197,7 +1197,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli) res= ev->apply_event(rli); } rli->deferred_events_collecting= true; - return res; + DBUG_RETURN(res); } void Deferred_log_events::rewind() |