summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-17 12:12:33 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-17 12:12:33 +0200
commit0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch)
tree7e682617fcbdab399d2eafccb6a4800dfdc71e51 /sql/log.cc
parent97ae1682f185be05276b172919e47fd86e9fd953 (diff)
parentdf905524b218de07dddf5fa394af96edcc4ca483 (diff)
downloadmariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz
merge with mysql-5.1.63
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 95f8e9e82ee..c74e8bc9233 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3233,8 +3233,6 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
pthread_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;
pthread_mutex_unlock(&rli->log_space_lock);
/*