bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3005) Bug#45402

[Magnus Blåudd]

#At file:///home/msvensson/mysql/bug45402/ based on revid:frazer@stripped3sd11ryycl

 3005 Magnus Blåudd	2009-09-14
      Bug#45402 Win32AsyncFile::rmrfReq can run an infinite loop
       - Fallback to delete as directory if DeleteFile fails

    modified:
      storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp	2009-05-28 18:54:28 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp	2009-09-14 12:41:02 +0000
@@ -402,7 +402,7 @@ loop:
     {
       int len = strlen(path);
       strcat(path, ffd.cFileName);
-      if(DeleteFile(path)) 
+      if(DeleteFile(path) || RemoveDirectory(path)) 
       {
         path[len] = 0;
 	continue;

Attachment: [text/bzr-bundle] bzr/[e-mail]