diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-06 20:23:14 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-06 20:23:14 +0300 |
| commit | 3f896fd8219b7fc00d0865b214296576b7f9ae29 (patch) | |
| tree | bd8673fc8216370192c420c2db3b46778697e1b1 /sql/mysqld.cc | |
| parent | 6fc8b48c4652d404b38146844d17ed2a01a3b327 (diff) | |
| parent | d5f0f77411f80be53c57fdd7b942230010a1140a (diff) | |
| download | mariadb-git-3f896fd8219b7fc00d0865b214296576b7f9ae29.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6213c43b80b..14d3921e543 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5622,14 +5622,16 @@ static uint set_maximum_open_files(uint max_file_limit) rlimit.rlim_cur=rlimit.rlim_max=max_file_limit; if (setrlimit(RLIMIT_NOFILE,&rlimit)) { - sql_print_error("Warning: setrlimit couldn't increase number of open files to more than %lu (request: %u)", - old_cur, max_file_limit); /* purecov: inspected */ + if (global_system_variables.log_warnings) + sql_print_error("Warning: setrlimit couldn't increase number of open files to more than %lu (request: %u)", + old_cur, max_file_limit); /* purecov: inspected */ max_file_limit=old_cur; } else { (void) getrlimit(RLIMIT_NOFILE,&rlimit); - if ((uint) rlimit.rlim_cur != max_file_limit) + if ((uint) rlimit.rlim_cur != max_file_limit && + global_system_variables.log_warnings) sql_print_error("Warning: setrlimit returned ok, but didn't change limits. Max open files is %ld (request: %u)", (ulong) rlimit.rlim_cur, max_file_limit); /* purecov: inspected */ |