diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
| commit | 16c5c53fc21b162844c38a87ac48205448ca1d2f (patch) | |
| tree | 7a50437d5f9da772ec8aaacab322e5f6c13e7305 /sql/log.cc | |
| parent | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (diff) | |
| parent | ed418461614d912fbb114053508b3fb09b1fc2f0 (diff) | |
| download | mariadb-git-16c5c53fc21b162844c38a87ac48205448ca1d2f.tar.gz | |
mysql 5.5.23 merge
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 577297fa1a4..e80a2aaec51 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3709,8 +3709,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); /* |