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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/mysys/my_delete.c b/mysys/my_delete.c
index bac3e2513e1..cff00bf7e08 100644
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.c
@@ -56,16 +56,20 @@ int nt_share_delete(const char *name, myf MyFlags)
   ulong cnt;
   DBUG_ENTER("nt_share_delete");
   DBUG_PRINT("my",("name %s MyFlags %d", name, MyFlags));
-  
+
   for (cnt= GetTickCount(); cnt; cnt--)
   {
     sprintf(buf, "%s.%08X.deleted", name, cnt);
     if (MoveFile(name, buf))
       break;
-      
+
     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;