diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
| commit | 93b4f84ab25bd2f79e024f339cf06fe2bd99d586 (patch) | |
| tree | 06fa007c99f039067fab2d2f00607b8f416181cf /sql/mysqld.cc | |
| parent | 1e8189fceed795a16d31f484f844b7a4a048b920 (diff) | |
| parent | 2ef2e2322a03b6decf4ad00721a27e6dc308847f (diff) | |
| download | mariadb-git-93b4f84ab25bd2f79e024f339cf06fe2bd99d586.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2c478ed7983..ebf3f239fa6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4252,8 +4252,8 @@ static int init_common_variables() files= my_set_max_open_files(max_open_files); SYSVAR_AUTOSIZE_IF_CHANGED(open_files_limit, files, ulong); - if (files < wanted_files && global_system_variables.log_warnings) - sql_print_warning("Could not increase number of max_open_files to more than %u (request: %u)", files, wanted_files); + if (files < max_open_files && global_system_variables.log_warnings) + sql_print_warning("Could not increase number of max_open_files to more than %u (request: %u)", files, max_open_files); /* If we required too much tc_instances than we reduce */ SYSVAR_AUTOSIZE_IF_CHANGED(tc_instances, |