diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-16 20:17:12 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-16 20:17:12 +0300 |
commit | 03c09837fc26822ba2332d9acc3e652b8d010d4c (patch) | |
tree | e03ceb8bd6282ab144446b9f5f7fb66188b25daa /mysys | |
parent | ea52a3eb9795f1ae04a4f9c2be4c81e43dc86c15 (diff) | |
parent | c430aa72abbdccb1ece7f0d65b49a6b48e7c5ba7 (diff) | |
download | mariadb-git-03c09837fc26822ba2332d9acc3e652b8d010d4c.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_tempfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index 51a3efa05ad..0f1c6d6b1bc 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -121,7 +121,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, /* explictly don't use O_EXCL here has it has a different meaning with O_TMPFILE */ - if ((file= open(dir, mode | O_TMPFILE | O_CLOEXEC, + if ((file= open(dir, (mode & ~O_CREAT) | O_TMPFILE | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)) >= 0) { my_snprintf(to, FN_REFLEN, "%s/#sql/fd=%d", dir, file); |