Skip to content

Commit 4ebc8d8

Browse files
authored
MDEV-29847: Wrong warning on rlimit capping of max_open_files (#2315)
Per the code my_set_max_open_files 3 lines earlier, we attempt to set the nofile (number of open files), rlimit to max_open_files. We should use this in the warning because wanted_files may not be the number.
1 parent 899cedb commit 4ebc8d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sql/mysqld.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4580,8 +4580,8 @@ static int init_common_variables()
45804580
files= my_set_max_open_files(max_open_files);
45814581
SYSVAR_AUTOSIZE_IF_CHANGED(open_files_limit, files, ulong);
45824582

4583-
if (files < wanted_files && global_system_variables.log_warnings)
4584-
sql_print_warning("Could not increase number of max_open_files to more than %u (request: %u)", files, wanted_files);
4583+
if (files < max_open_files && global_system_variables.log_warnings)
4584+
sql_print_warning("Could not increase number of max_open_files to more than %u (request: %u)", files, max_open_files);
45854585

45864586
/* If we required too much tc_instances than we reduce */
45874587
SYSVAR_AUTOSIZE_IF_CHANGED(tc_instances,

0 commit comments

Comments
 (0)