bk commit into 5.0 tree (msvensson:1.2109) BUG#18474

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2109 06/03/23 23:09:34 msvensson@shellback.(none) +1 -0
  Bug#18474 Unlistable directories yield no info from information_schema, part2
   - Make the windows implementation of 'my_dir' behave like the default implementation

  mysys/my_lib.c
    1.23 06/03/23 23:09:29 msvensson@shellback.(none) +17 -9
    If 'findfirst' returns EINVAL, just continue and return 0 files to read in this dir.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.22/mysys/my_lib.c	2006-01-24 12:59:02 +01:00
+++ 1.23/mysys/my_lib.c	2006-03-23 23:09:29 +01:00
@@ -398,14 +398,6 @@
   tmp_file[2]='*';
   tmp_file[3]='\0';
 
-#ifdef __BORLANDC__
-  if ((handle= findfirst(tmp_path,&find,0)) == -1L)
-    goto error;
-#else
-  if ((handle=_findfirst(tmp_path,&find)) == -1L)
-    goto error;
-#endif
-
   if (!(buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 
                           ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
                           sizeof(MEM_ROOT), MyFlags)))
@@ -425,7 +417,23 @@
   
   /* MY_DIR structure is allocated and completly initialized at this point */
   result= (MY_DIR*)buffer;
- 
+
+#ifdef __BORLANDC__
+  if ((handle= findfirst(tmp_path,&find,0)) == -1L)
+#else
+  if ((handle=_findfirst(tmp_path,&find)) == -1L)
+#endif
+  {
+    DBUG_PRINT("info", ("find_first returned error"));
+    if  (errno != EINVAL)
+      goto error;
+    /*
+      Could not read the directory, no read access.
+      Probably because by "chmod -r".
+      continue and return zero files in dir
+    */
+  }
+
   do
   {
 #ifdef __BORLANDC__