diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-07-14 16:05:29 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-07-14 16:05:29 -0400 |
| commit | dced5146bdfc46e200ba35a86c3c55fb60972e33 (patch) | |
| tree | 22e3dd18f4edec2a585341fee607765f96b2744f /mysys/my_open.c | |
| parent | 75931feabe99595e9659a423e299c4229d3c02ba (diff) | |
| download | mariadb-git-dced5146bdfc46e200ba35a86c3c55fb60972e33.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'mysys/my_open.c')
| -rw-r--r-- | mysys/my_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c index 5263ba4b5c8..b6d8f08bfc1 100644 --- a/mysys/my_open.c +++ b/mysys/my_open.c @@ -46,9 +46,9 @@ File my_open(const char *FileName, int Flags, myf MyFlags) #if defined(_WIN32) fd= my_win_open(FileName, Flags); #elif !defined(NO_OPEN_3) - fd = open(FileName, Flags, my_umask); /* Normal unix */ + fd = open(FileName, Flags | O_CLOEXEC, my_umask); /* Normal unix */ #else - fd = open((char *) FileName, Flags); + fd = open((char *) FileName, Flags | O_CLOEXEC); #endif fd= my_register_filename(fd, FileName, FILE_BY_OPEN, |