diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
commit | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch) | |
tree | 0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /sql/log.cc | |
parent | 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff) | |
parent | 57f824b0990b0a8708665a4a9ede245ce6064539 (diff) | |
download | mariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz |
5.1 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 047439f6b73..4e42298a03c 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3276,8 +3276,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); /* |