diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
| commit | 4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch) | |
| tree | 6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /sql/rpl_utility.cc | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
| download | mariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz | |
5.5 merge and fixes for compiler/test errors
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 6bbe998a624..22ee49b9bfb 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -1146,7 +1146,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; @@ -1157,7 +1157,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() |