1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a false positive GCC5 warning.

Browse Source
This commit is contained in:
Vladislav Vaintroub 2021-09-06 19:07:24 +02:00
parent 84c578c795
commit b729c1a1ec
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/signal_handler.cc
View File

@ -191,16 +191,18 @@ extern "C" sig_handler handle_fatal_signal(int sig)
if (dflt_key_cache && thread_scheduler) if (dflt_key_cache && thread_scheduler)
{ {
size_t used_mem=
(dflt_key_cache->key_cache_mem_size +
(global_system_variables.read_buff_size +
(size_t) global_system_variables.sortbuff_size) *
(thread_scheduler->max_threads + extra_max_connections) +
(max_connections + extra_max_connections) * sizeof(THD)) / 1024;
my_safe_printf_stderr("It is possible that mysqld could use up to \n" my_safe_printf_stderr("It is possible that mysqld could use up to \n"
"key_buffer_size + " "key_buffer_size + "
"(read_buffer_size + sort_buffer_size)*max_threads = " "(read_buffer_size + sort_buffer_size)*max_threads = "
"%zu K bytes of memory\n", "%zu K bytes of memory\n", used_mem);
(dflt_key_cache->key_cache_mem_size +
(global_system_variables.read_buff_size +
(size_t)global_system_variables.sortbuff_size) *
(thread_scheduler->max_threads + extra_max_connections) +
(max_connections + extra_max_connections) *
sizeof(THD)) / 1024);
my_safe_printf_stderr("%s", my_safe_printf_stderr("%s",
"Hope that's ok; if not, decrease some variables in " "Hope that's ok; if not, decrease some variables in "
"the equation.\n\n"); "the equation.\n\n");