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 | 549a5fa249a02b0cd97e4a412dd7297daa69bd7d (patch) | |
| tree | 29fd8334d96e61fb52a3293d8532ff41ac2bf6a6 /sql/log.cc | |
| parent | e56854d8e55b5bc344685b17ed7cf1c1bb8a574a (diff) | |
| parent | 28e7195644725bba9112bc9d6b477d1ca2905400 (diff) | |
| download | mariadb-git-549a5fa249a02b0cd97e4a412dd7297daa69bd7d.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/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index ec4c01003e0..7f629658311 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3619,8 +3619,6 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included) mysql_mutex_lock(&rli->log_space_lock); rli->relay_log.purge_logs(to_purge_if_included, included, 0, 0, &rli->log_space_total); - // Tell the I/O thread to take the relay_log_space_limit into account - rli->ignore_log_space_limit= 0; mysql_mutex_unlock(&rli->log_space_lock); /* |