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 /sql/mysqld.cc | |
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 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 55f5920bdce..dce2219aeed 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2704,7 +2704,7 @@ static void init_signals(void) { /* Change limits so that we will get a core file */ STRUCT_RLIMIT rl; - rl.rlim_cur = rl.rlim_max = RLIM_INFINITY; + rl.rlim_cur = rl.rlim_max = (rlim_t) RLIM_INFINITY; if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings) sql_print_warning("setrlimit could not change the size of core files to 'infinity'; We may not be able to generate a core file on signals"); } |