Merge with 4.0 to get bug fixes

Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/system_mysql_db_refs.result:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged

1 files changed, 11 insertions, 0 deletions

diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index 055e00d2efc..0207d9a3683 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -461,6 +461,17 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
     else
       finfo.mystat= NULL;
 
+    /*
+      If the directory is the root directory of the drive, Windows sometimes
+      creates hidden or system files there (like RECYCLER); do not show
+      them. We would need to see how this can be achieved with a Borland
+      compiler.
+    */
+#ifndef __BORLANDC__
+    if (attrib & (_A_HIDDEN | _A_SYSTEM))
+      continue;
+#endif
+
     if (push_dynamic(dir_entries_storage, (gptr)&finfo))
       goto error;