bzr commit into mysql-5.1-telco-7.0 branch (jack:2942) Bug#45402

[jack andrews]

#At file:///C:/w/repo/mysql-5.1-telco-7.0-bug45402/ based on
revid:jack@stripped

 2942 jack andrews	2009-07-03
      Bug #45402  	Win32AsyncFile::rmrfReq can run an infinite loop
        - fixed a bug:  old behaviour is to return without error if 
                        the path doesn't exist.
          made it work like the original

    modified:
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2009-07-03 14:29:27 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2009-07-03 14:43:05 +0000
@@ -117,12 +117,12 @@ inline 
 void 
 AsyncFile::rmrfReq(Request *request, const char * path, bool removePath)
 {
+  struct stat statbuf;
+  if (stat(path,&statbuf)==-1 && errno==ENOENT)
+    return;
   if (!request->par.rmrf.directory)
   {
     // Remove file
-    struct stat statbuf;
-    if (stat(path,&statbuf)==-1 && errno==ENOENT)
-      return;
     if(ndb_remove_entry(path)) 
       request->error = errno;
     return;


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