mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera

Browse source
This commit is contained in:
Jan Lindström 2018-05-07 13:49:14 +03:00
commit 648cf7176c
118 changed files with 1536 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

10
storage/innobase/os/os0file.cc
View file

@ -2,7 +2,7 @@
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2009, Percona Inc.
Copyright (c) 2013, 2017, MariaDB Corporation.
Copyright (c) 2013, 2018, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted
by Percona Inc.. Those modifications are
@ -1265,7 +1265,7 @@ os_file_create_simple_func(
}
do {
file = ::open(name, create_flag, os_innodb_umask);
file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask);
if (file == -1) {
*success = FALSE;
@ -1428,7 +1428,7 @@ os_file_create_simple_no_error_handling_func(
return(file);
}
file.m_file = ::open(name, create_flag, os_innodb_umask);
file.m_file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask);
*success = file.m_file == -1 ? FALSE : TRUE;
@ -1755,7 +1755,7 @@ os_file_create_func(
#endif /* O_SYNC */
do {
file.m_file = ::open(name, create_flag, os_innodb_umask);
file.m_file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask);
if (file.m_file == -1) {
const char* operation;
@ -3149,7 +3149,7 @@ os_file_get_status(
access = !srv_read_only_mode ? O_RDWR : O_RDONLY;
fh = ::open(path, access, os_innodb_umask);
fh = ::open(path, access | O_CLOEXEC, os_innodb_umask);
if (fh == -1) {
stat_info->rw_perm = false;