summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysys/my_open.c4
-rw-r--r--plugin/server_audit/server_audit.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c
index d19db0aaf0c..24d5c881372 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -45,10 +45,8 @@ File my_open(const char *FileName, int Flags, myf MyFlags)
MyFlags|= my_global_flags;
#if defined(_WIN32)
fd= my_win_open(FileName, Flags);
-#elif !defined(NO_OPEN_3)
- fd = open(FileName, Flags, my_umask); /* Normal unix */
#else
- fd = open((char *) FileName, Flags);
+ fd = open(FileName, Flags, my_umask);
#endif
fd= my_register_filename(fd, FileName, FILE_BY_OPEN,
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index eae7ad12f1c..10dcb1852e8 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -158,10 +158,8 @@ static File loc_open(const char *FileName, int Flags)
File fd;
#if defined(_WIN32)
fd= my_win_open(FileName, Flags);
-#elif !defined(NO_OPEN_3)
- fd = open(FileName, Flags, my_umask); /* Normal unix */
#else
- fd = open((char *) FileName, Flags);
+ fd = open(FileName, Flags, my_umask);
#endif
my_errno= errno;
return fd;