database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge with mysql-5.1.63

Browse Source
This commit is contained in:
Sergei Golubchik
2012-05-17 12:12:33 +02:00
parent 97ae1682f1 df905524b2
commit 0a8c9b98f6
102 changed files with 2496 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log.cc
View File

@@ -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);
/*