diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:24:51 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:24:51 +0200 |
commit | b7914f562da0d4bce7c1c26b119e7063594be974 (patch) | |
tree | df85f229a896cf3e6b24ebc34063b078774b3834 /mysys/my_rename.c | |
parent | 21ef68d52e13ec146dab6cf54e0d3eca87306d58 (diff) | |
parent | d7a4ce3c804334914b2431e91d6328945dce6b02 (diff) | |
download | mariadb-git-b7914f562da0d4bce7c1c26b119e7063594be974.tar.gz |
Merge 10.8 into 10.9
Diffstat (limited to 'mysys/my_rename.c')
-rw-r--r-- | mysys/my_rename.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/mysys/my_rename.c b/mysys/my_rename.c index 73fc2fbe47c..cc3ed727168 100644 --- a/mysys/my_rename.c +++ b/mysys/my_rename.c @@ -34,41 +34,24 @@ */ static BOOL win_rename_with_retries(const char *from, const char *to) { -#ifndef DBUG_OFF - FILE *fp = NULL; - DBUG_EXECUTE_IF("rename_sharing_violation", - { - fp= fopen(from, "r"); - DBUG_ASSERT(fp); - } - ); -#endif + DBUG_INJECT_FILE_SHARING_VIOLATION(from); - for (int retry= RENAME_MAX_RETRIES; retry--;) + for (int retry= FILE_SHARING_VIOLATION_RETRIES; retry--;) { BOOL ret= MoveFileEx(from, to, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); + DBUG_CLEAR_FILE_SHARING_VIOLATION(); + if (ret) return ret; DWORD last_error= GetLastError(); + if (last_error == ERROR_SHARING_VIOLATION || last_error == ERROR_ACCESS_DENIED) { -#ifndef DBUG_OFF - /* - If error was injected in via DBUG_EXECUTE_IF, close the file - that is causing ERROR_SHARING_VIOLATION, so that retry succeeds. - */ - if (fp) - { - fclose(fp); - fp= NULL; - } -#endif - - Sleep(10); + Sleep(FILE_SHARING_VIOLATION_DELAY_MS); } else return ret; |