diff options
| author | petr@mysql.com <> | 2006-05-05 10:45:58 +0400 |
|---|---|---|
| committer | petr@mysql.com <> | 2006-05-05 10:45:58 +0400 |
| commit | fec70c97c93537001bc51538221328a3d2dfa37e (patch) | |
| tree | c388200837e23985854de7a23be71ad14804ceda /sql/slave.cc | |
| parent | 55ccf0fe87daf94c0c84c031ba9d6ff50c843ffb (diff) | |
| download | mariadb-git-fec70c97c93537001bc51538221328a3d2dfa37e.tar.gz | |
WL#3153 "Split logs". Recommit with post-review fixes
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 4ab9e951813..4ed78ea2de1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4570,7 +4570,7 @@ static Log_event* next_event(RELAY_LOG_INFO* rli) When the relay log is created when the I/O thread starts, easy: the master will send the description event and we will queue it. But if the relay log is created by new_file(): then the solution is: - MYSQL_LOG::open() will write the buffered description event. + MYSQL_BIN_LOG::open() will write the buffered description event. */ if ((ev=Log_event::read_log_event(cur_log,0, rli->relay_log.description_event_for_exec))) @@ -4832,7 +4832,8 @@ err: Rotate a relay log (this is used only by FLUSH LOGS; the automatic rotation because of size is simpler because when we do it we already have all relevant locks; here we don't, so this function is mainly taking locks). - Returns nothing as we cannot catch any error (MYSQL_LOG::new_file() is void). + Returns nothing as we cannot catch any error (MYSQL_BIN_LOG::new_file() + is void). */ void rotate_relay_log(MASTER_INFO* mi) @@ -4854,7 +4855,7 @@ void rotate_relay_log(MASTER_INFO* mi) } /* If the relay log is closed, new_file() will do nothing. */ - rli->relay_log.new_file(1); + rli->relay_log.new_file(); /* We harvest now, because otherwise BIN_LOG_HEADER_SIZE will not immediately |