mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-base merge.

Browse source 
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
This commit is contained in:
Sergei Golubchik 2013-09-21 10:14:42 +02:00
commit 9af177042e
3463 changed files with 1907096 additions and 85420 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/rpl_utility.cc
View file

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