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 | abab51e0dba6415d30ae5c9d967561070be45e4e (patch) | |
| tree | 9e8865e4297ebff57bac639031c2ed3e115be98a /mysys | |
| parent | d7511181c5866e34601df639ad51a68ff4caea08 (diff) | |
| parent | 9d59b2705a696545d12f849e01ad40f95b17f1cb (diff) | |
| download | mariadb-git-abab51e0dba6415d30ae5c9d967561070be45e4e.tar.gz | |
Automerge of mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'mysys')
| -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); |