diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 11:17:42 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 11:17:42 +0400 |
| commit | 456235a13c7e8cb5ba14072ba24ceee5fb877719 (patch) | |
| tree | 9e8865e4297ebff57bac639031c2ed3e115be98a /mysys/my_file.c | |
| parent | 93009c60da170c7a6cdf106a39226969c88de517 (diff) | |
| parent | 97afbf5a279363e2052f97c96af4e36dfe7dd30a (diff) | |
| download | mariadb-git-456235a13c7e8cb5ba14072ba24ceee5fb877719.tar.gz | |
Automerge of mysql-5.1-bugteam to mysql-trunk-merge.
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 ec0c9c425ea..a31673b31bc 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); |