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

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

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;