diff options
| author | Luis Soares <luis.soares@oracle.com> | 2012-03-12 22:02:50 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2012-03-12 22:02:50 +0000 |
| commit | b06a48e413131caea8a2e056ea4891114d773251 (patch) | |
| tree | 29fd8334d96e61fb52a3293d8532ff41ac2bf6a6 /sql/rpl_rli.h | |
| parent | 273c626269cfcc7f20f1d0212d3aa3bff0c14f02 (diff) | |
| parent | c41a6fec10d043a85a2e5882cc8c259aee867f07 (diff) | |
| download | mariadb-git-b06a48e413131caea8a2e056ea4891114d773251.tar.gz | |
BUG#12400313
Manual merge from mysql-5.1 into mysql-5.5.
CONFLICTS
=========
Text conflict in sql/log.cc
Text conflict in sql/slave.cc
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 0671b19dd42..660a98b1213 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -202,6 +202,13 @@ public: 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 committing event (the COMMIT query event, or the event if in autocommit |