merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam

This commit is contained in:
Alfranio Correia 2010-06-17 01:25:07 +01:00
commit cdc4e9ebce
8 changed files with 191 additions and 42 deletions

View file

@ -7560,12 +7560,6 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
error= 0;
}
if (!cache_stmt)
{
DBUG_PRINT("info", ("Marked that we need to keep log"));
thd->options|= OPTION_KEEP_LOG;
}
} // if (table)
/*