diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-07 15:32:35 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-07 15:32:35 +0100 |
commit | 01ac7455e2c974affbf335c4bc1acbfe71b7127b (patch) | |
tree | a0a8a40e9b4eb100bd6f039c532a954c40b5a6c2 /sql | |
parent | 3303748fd13399ba39ce4d646153d086c5a09445 (diff) | |
parent | baa6b052a2ad012aaedb1db0e1e549de3c9e0c29 (diff) | |
download | mariadb-git-01ac7455e2c974affbf335c4bc1acbfe71b7127b.tar.gz |
Merge branch '10.3' into bb-10.3-release
Diffstat (limited to 'sql')
-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 5d58d42faf9..84c3b9fb0a6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4580,8 +4580,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, |