bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3718)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 3718 Magnus Blåudd	2010-08-26
      ndb
       - revert logic so that 'next_file' returns everything not a directory on Windows.

    modified:
      storage/ndb/src/common/portlib/NdbDir.cpp
=== modified file 'storage/ndb/src/common/portlib/NdbDir.cpp'
--- a/storage/ndb/src/common/portlib/NdbDir.cpp	2010-08-23 11:20:11 +0000
+++ b/storage/ndb/src/common/portlib/NdbDir.cpp	2010-08-26 06:45:37 +0000
@@ -98,7 +98,7 @@ class DirIteratorImpl {
     return (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
   }
   bool is_regular_file(const WIN32_FIND_DATA find_data) const {
-    return (find_data.dwFileAttributes & FILE_ATTRIBUTE_NORMAL);
+    return !is_dir(find_data);
   }
 
 public:

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