diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-14 23:52:17 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-14 23:52:17 +0300 |
| commit | c36c37c33973bba01651b82ccd1a3fabbb7732a4 (patch) | |
| tree | 13aec0c9e077be24b5681ea8c9941ced5e095ffd /sql | |
| parent | 45db29dbc21488cca50ce60e58996ce57cd29616 (diff) | |
| parent | e97b2766e1cc1d03eca8d1ad21c2eef1a6f923bb (diff) | |
| download | mariadb-git-c36c37c33973bba01651b82ccd1a3fabbb7732a4.tar.gz | |
merge
mysql-test/r/rpl_max_relay_size.result:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index e4bdcf55534..17715620950 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -584,7 +584,7 @@ bool MYSQL_LOG::reset_logs(THD* thd) } /* Start logging with a new file */ - close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT); + close(LOG_CLOSE_INDEX); my_delete(index_file_name, MYF(MY_WME)); // Reset (open will update) if (!thd->slave_thread) need_start_event=1; @@ -1544,7 +1544,7 @@ void MYSQL_LOG::close(uint exiting) { // One can't set log_type here! DBUG_ENTER("MYSQL_LOG::close"); DBUG_PRINT("enter",("exiting: %d", (int) exiting)); - if (is_open()) + if (log_type != LOG_CLOSED && log_type != LOG_TO_BE_OPENED) { if (log_type == LOG_BIN && !no_auto_events && (exiting & LOG_CLOSE_STOP_EVENT)) |