From e203a42dfc25f43bceb833f153c68b48d32ccbf5 Mon Sep 17 00:00:00 2001
From: "aivanov@mysql.com" <>
Date: Wed, 19 Oct 2005 18:01:23 +0400
Subject: [PATCH] Fix for BUG#4375: Windows specific directories are copied 
 during replication.  Modified my_dir(). Now this function skips hidden and
 system  files which sometimes are created by Windows.  NOTE. The fix is
 similar to the previuos one (05 July 2004)  except for correct setting of the
 'attrib' variable value  (within the previous fix this variable was left
 uninitialized  when my_dir() was called with My_flags & MY_WANT_STAT == 0).

---
 mysys/my_lib.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index c3b0b57e549..1908c70f407 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -426,6 +426,18 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
  
   do
   {
+#ifdef __BORLANDC__
+    attrib= find.ff_attrib;
+#else
+    attrib= find.attrib;
+    /*
+      Do not show hidden and system files which Windows sometimes create.
+      Note. Because Borland's findfirst() is called with the third
+      argument = 0 hidden/system files are excluded from the search.
+    */
+    if (attrib & (_A_HIDDEN | _A_SYSTEM))
+      continue;
+#endif    
 #ifdef __BORLANDC__
     if (!(finfo.name= strdup_root(names_storage, find.ff_name)))
       goto error;
@@ -442,11 +454,10 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
       bzero(finfo.mystat, sizeof(MY_STAT));
 #ifdef __BORLANDC__
       finfo.mystat->st_size=find.ff_fsize;
-      mode=MY_S_IREAD; attrib=find.ff_attrib;
 #else
       finfo.mystat->st_size=find.size;
-      mode=MY_S_IREAD; attrib=find.attrib;
 #endif
+      mode=MY_S_IREAD;
       if (!(attrib & _A_RDONLY))
 	mode|=MY_S_IWRITE;
       if (attrib & _A_SUBDIR)