diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-10-26 20:29:11 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-10-26 20:29:11 +0300 |
| commit | a0df01faa5b06c951922ffdbb0ed02260386c080 (patch) | |
| tree | ebebda4471b8b1b1aa27dbecf53f07d24b74e697 /innobase/fil | |
| parent | 8ee124176690ed611c8851e3dd50a823c498a08b (diff) | |
| download | mariadb-git-a0df01faa5b06c951922ffdbb0ed02260386c080.tar.gz | |
row0mysql.c:
Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
os0file.c:
Do not call exit(1) if os_file_delete() fails; remove unused parameter from
handle_error_no_exit()
fil0fil.c:
Allow DROP TABLE even if the .ibd file for the table does not exist
innobase/fil/fil0fil.c:
Allow DROP TABLE even if the .ibd file for the table does not exist
innobase/os/os0file.c:
Dono not call exit(1) if os_file_delete() fails; remove unused parameter from handle_error_no_exit()
innobase/row/row0mysql.c:
Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
Diffstat (limited to 'innobase/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index c4fc055dcde..98dea14f47b 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1868,6 +1868,10 @@ try_again: if (success) { success = os_file_delete(path); + + if (!success) { + success = os_file_delete_if_exists(path); + } } if (success) { |