diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
| commit | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (patch) | |
| tree | af3f0dfb833c3c4aabaa69ce50cfb64202ecd479 /mysys/my_file.c | |
| parent | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (diff) | |
| parent | af6d89a6aa9feb3545de068f461cf91bfb281dd2 (diff) | |
| download | mariadb-git-4aa9d903c11554cc4887eeffe7f0592c52e8bc99.tar.gz | |
Merge with MySQL 5.1.47
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb
configure.in:
Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not anymore locked in init
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 64dc4745703..594f361437f 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); |