diff options
| author | lars@mysql.com <> | 2006-06-29 14:14:08 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2006-06-29 14:14:08 +0200 |
| commit | 0e45d269936331a084095ccf699e16d65164854c (patch) | |
| tree | 57fc959ce4d83c02328efd32b08375383ff2e131 /sql/log.cc | |
| parent | 4e59b4351283d2475af215c5fa773c1615946f5b (diff) | |
| parent | 6036c30b5711953bbb984d82839f990c1868aff0 (diff) | |
| download | mariadb-git-0e45d269936331a084095ccf699e16d65164854c.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
Diffstat (limited to 'sql/log.cc')
| -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 cfb90d398e6..ebd1d10d8b7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -968,14 +968,14 @@ bool MYSQL_LOG::reset_logs(THD* thd) for (;;) { - my_delete(linfo.log_file_name, MYF(MY_WME)); + my_delete_allow_opened(linfo.log_file_name, MYF(MY_WME)); if (find_next_log(&linfo, 0)) break; } /* Start logging with a new file */ close(LOG_CLOSE_INDEX); - my_delete(index_file_name, MYF(MY_WME)); // Reset (open will update) + my_delete_allow_opened(index_file_name, MYF(MY_WME)); // Reset (open will update) if (!thd->slave_thread) need_start_event=1; if (!open_index_file(index_file_name, 0)) |