1 files changed, 7 insertions, 4 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 4310250bd0d..3c6f1b15384 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -39,13 +39,16 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags)
     very  well 
   */
 #ifdef __WIN__
-  if (! (Flags & O_CREAT) && my_access(FileName, F_OK))
-	  fd=0;
+  if (check_if_legal_filename(FileName))
+  {
+    errno= EACCES;
+    fd= 0;
+  }
   else
 #endif
   {
-  	make_ftype(type,Flags);
-  	fd = fopen(FileName, type);
+    make_ftype(type,Flags);
+    fd = fopen(FileName, type);
   }
   
   if (fd != 0)