diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
| commit | a249e57b684a23dce4cbb870ca3eb30c77cb9fd6 (patch) | |
| tree | 9c50673311474f7efa0d5d110461ad324c7a62e6 /mysys | |
| parent | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (diff) | |
| parent | 955c7b32226c816b24a2ed1750e12bc0256565ad (diff) | |
| download | mariadb-git-a249e57b684a23dce4cbb870ca3eb30c77cb9fd6.tar.gz | |
Merge 10.1 into 10.2
Temporarily disable a test for
commit 2175bfce3e9da8332f10ab0e0286dc93915533a2
because fixing it in 10.2 requires updating libmariadb.
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 */ |