summaryrefslogtreecommitdiff
path: root/mysys/my_lib.c
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-07-05 19:07:26 +0200
committerguilhem@mysql.com <>2004-07-05 19:07:26 +0200
commit912eb811ba138672d6e2baaebd0d5bcd97dd2166 (patch)
tree216fdade40f83ac46acb65730b8a1a1345220b60 /mysys/my_lib.c
parent83dbc6b0060d83f3102af54ccef97346f0fac629 (diff)
downloadmariadb-git-912eb811ba138672d6e2baaebd0d5bcd97dd2166.tar.gz
Windows-specific:
Fix for BUG#4375 "Windows specific directories are copied during replication": in the Windows version of my_dir(), do not show hidden or system files which Windows sometimes creates in the root directory of drive (like RECYCLER and SYSTEM VOLUME INFORMATION directories) (so this problem showed up only when the datadir was the root dir of a drive). This will make SHOW DATABASES display better, and will do no harm to MySQL. For example, DROP DATABASE will not miss some files, as MySQL creates no hidden or system files.
Diffstat (limited to 'mysys/my_lib.c')
-rw-r--r--mysys/my_lib.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index 055e00d2efc..21c558ed489 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -461,6 +461,15 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
else
finfo.mystat= NULL;
+ /*
+ Do not show hidden or system files which Windows sometimes creates. 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;