diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
commit | c4f97d3cfa46a7f1b283926dd7fedb648566283f (patch) | |
tree | d28e2ef33cd64ce35ce9a4cd92fdee720a9d5e82 /mysys | |
parent | 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (diff) | |
parent | eff71f39ddc117d09da5465f7ea9fe007ed89009 (diff) | |
download | mariadb-git-c4f97d3cfa46a7f1b283926dd7fedb648566283f.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysys/my_file.c b/mysys/my_file.c index a23ab487d00..23226595b2e 100644 --- a/mysys/my_file.c +++ b/mysys/my_file.c @@ -52,10 +52,9 @@ static uint set_max_open_files(uint max_file_limit) DBUG_PRINT("info", ("rlim_cur: %u rlim_max: %u", (uint) rlimit.rlim_cur, (uint) rlimit.rlim_max)); - if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY) - rlimit.rlim_cur = max_file_limit; - if (rlimit.rlim_cur >= max_file_limit) - DBUG_RETURN(rlimit.rlim_cur); /* purecov: inspected */ + if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY || + rlimit.rlim_cur >= max_file_limit) + DBUG_RETURN(max_file_limit); rlimit.rlim_cur= rlimit.rlim_max= max_file_limit; if (setrlimit(RLIMIT_NOFILE, &rlimit)) max_file_limit= old_cur; /* Use original value */ |