diff options
author | petr@outpost.site <> | 2006-06-15 15:38:14 +0400 |
---|---|---|
committer | petr@outpost.site <> | 2006-06-15 15:38:14 +0400 |
commit | 86420b38aac19b75a83fc64b78d8828e5eb919dd (patch) | |
tree | e254dd4f485d01b877be8dd6ba6c68fe27966934 /sql/slave.cc | |
parent | 2210731ea4578ddf444c91525ef99d6025ce1d60 (diff) | |
parent | 9669d3ae586909c56a004e8522c522e3bbc10017 (diff) | |
download | mariadb-git-86420b38aac19b75a83fc64b78d8828e5eb919dd.tar.gz |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
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 5ef91b1f0d4..f143faf427c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4658,7 +4658,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))) @@ -4920,7 +4920,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) @@ -4942,7 +4943,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 |