diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-28 13:35:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-28 13:35:10 +0200 |
| commit | e926af9bf8d2b00c2c31a3741f65e3d5b846dffe (patch) | |
| tree | f3910ce9605223eeb0ad603d4b7d221f4b640ce7 /mysys/my_file.c | |
| parent | ef0416c14c6a6ba950990c73dd46d8e13f03ad03 (diff) | |
| parent | e2efd9338574c87177e0c00273e6e49a32ce2aa6 (diff) | |
| download | mariadb-git-e926af9bf8d2b00c2c31a3741f65e3d5b846dffe.tar.gz | |
Merge with fixes for compiler warnings and 2 fixed test cases
Fixed some additional compiler warnings from OpenSolaris build.
extra/libevent/devpoll.c:
Fixed compiler warning
mysys/my_file.c:
Fixed compiler warning
sql/mysqld.cc:
Fixed compiler warning
sql/rpl_record.cc:
Removed not used variable
storage/maria/ma_blockrec.c:
Fixed compiler warning
storage/xtradb/buf/buf0buf.c:
Fixed compiler warning
storage/xtradb/handler/i_s.cc:
Fixed compiler warning
support-files/compiler_warnings.supp:
Added suppression of compiler warnings in InnoDB/XtraDB
Added suppression of compiler warnings that can safely be ignored.
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..64dc4745703 100644 --- a/mysys/my_file.c +++ b/mysys/my_file.c @@ -51,7 +51,7 @@ 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 (rlimit.rlim_cur == RLIM_INFINITY) + 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 */ |