Merge stella.local:/home2/mydev/mysql-5.1-bug26379-8

into stella.local:/home2/mydev/mysql-5.1-axmrg

Merge stella.local:/home2/mydev/mysql-5.1-bug26379-8
into stella.local:/home2/mydev/mysql-5.1-axmrg
1386274a · istruewing@stella.local · bd215483 · 3be8cf8f · 1386274a
Commit 1386274a authored Nov 25, 2007 by istruewing@stella.local
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

mysys/my_delete.c mysys/my_delete.c +7 -3

No files found.
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.c
@@ -66,6 +66,10 @@ int nt_share_delete(const char *name, myf MyFlags)
    if ((errno= GetLastError()) == ERROR_ALREADY_EXISTS)
      continue;

+    /* This happened during tests with MERGE tables. */
+    if (errno == ERROR_ACCESS_DENIED)
+      continue;
+
    DBUG_PRINT("warning", ("Failed to rename %s to %s, errno: %d",
                           name, buf, errno));
    break;