database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

5.5 merge and fixes for compiler/test errors

Browse Source
This commit is contained in:
Sergei Golubchik
2013-09-18 13:07:31 +02:00
parent 1a2a9d74fe 197bdbae4d
commit 4ec2e9d7ed
3617 changed files with 1904339 additions and 85313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/rpl_utility.cc
View File

@ -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()