1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.5' into 10.6

This commit is contained in:
Oleksandr Byelkin
2021-10-29 13:01:02 +02:00
9 changed files with 39 additions and 21 deletions

View File

@ -1746,9 +1746,9 @@ static void print_pool_blocked_message(bool max_threads_reached)
if (now > pool_block_start + BLOCK_MSG_DELAY && !msg_written)
{
if (max_threads_reached)
sql_print_error(MAX_THREADS_REACHED_MSG);
sql_print_warning(MAX_THREADS_REACHED_MSG);
else
sql_print_error(CREATE_THREAD_ERROR_MSG, my_errno);
sql_print_warning(CREATE_THREAD_ERROR_MSG, my_errno);
sql_print_information("Threadpool has been blocked for %u seconds\n",
(uint)((now- pool_block_start)/1000000));