5.2 merge

This commit is contained in:
Sergei Golubchik 2012-05-20 14:57:29 +02:00
commit 7f6f53a8df
117 changed files with 2796 additions and 340 deletions

View file

@ -189,6 +189,13 @@ public:
ulonglong log_space_limit,log_space_total;
bool ignore_log_space_limit;
/*
Used by the SQL thread to instructs the IO thread to rotate
the logs when the SQL thread needs to purge to release some
disk space.
*/
bool sql_force_rotate_relay;
/*
When it commits, InnoDB internally stores the master log position it has
processed so far; the position to store is the one of the end of the