diff options
| author | unknown <lars@mysql.com> | 2006-06-29 14:14:08 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-06-29 14:14:08 +0200 |
| commit | 32e2acadc3f58ad204b5bc9f13dc869548d1ce4e (patch) | |
| tree | 57fc959ce4d83c02328efd32b08375383ff2e131 /sql/log.cc | |
| parent | f7bc05b6a17def42b637c61d29433dc1fc5fb498 (diff) | |
| parent | 11d38c1d44a4e070b3da94a6ea8cc3c5fc06e40b (diff) | |
| download | mariadb-git-32e2acadc3f58ad204b5bc9f13dc869548d1ce4e.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
include/my_sys.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
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)) |