diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-04-09 14:47:18 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-04-09 14:47:18 +0300 |
| commit | 17a21c4f35812eba71a44e906e18ec947517cf35 (patch) | |
| tree | f02552bc470e100352e6c4cdb9abfc1d0dbbe472 /mysys/my_file.c | |
| parent | 24a9fb555c6c471222598688fcaf8d5405fea531 (diff) | |
| download | mariadb-git-17a21c4f35812eba71a44e906e18ec947517cf35.tar.gz | |
Bug #47095: Can't open_files_limit really be larger than 65535?
Several problems addressed:
1. The maximum value for --open_files_limit on non-windows boxes
is now raised to UINT_MAX (the maximum possible without significant
changes in the code). The maximum value on windows is kept to be
2048 due to a known limitation (bug 24509).
2. mysqld_safe now supports --open_files_limit=xx in addition to
--open-files-limit=xx
3. mysqld_safe always passes through --open[_-]files[_-]limit
to the underlying mysqld. It used to pass it through only if it
the user running the script has access to the root directory or
there was an --user argument specified.
4. Fixed a prototype in my_file.c to match its counterpart in
the other #ifdef branch.
Diffstat (limited to 'mysys/my_file.c')
| -rw-r--r-- | mysys/my_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_file.c b/mysys/my_file.c index 44bacf55307..d37da975c37 100644 --- a/mysys/my_file.c +++ b/mysys/my_file.c @@ -72,7 +72,7 @@ static uint set_max_open_files(uint max_file_limit) } #else -static int set_max_open_files(uint max_file_limit) +static uint set_max_open_files(uint max_file_limit) { /* We don't know the limit. Return best guess */ return min(max_file_limit, OS_FILE_LIMIT); |