database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
parent a49f5525bb 7841a7eb09
commit ae6bdc6769
345 changed files with 7745 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/mysqld.cc
View File

@@ -442,7 +442,7 @@ ulong delay_key_write_options;
uint protocol_version;
uint lower_case_table_names;
ulong tc_heuristic_recover= 0;
Atomic_counter<uint32_t> thread_count;
Atomic_counter<uint32_t> THD_count::count, CONNECT::count;
bool shutdown_wait_for_slaves;
Atomic_counter<uint32_t> slave_open_temp_tables;
ulong thread_created;
@@ -1715,6 +1715,9 @@ static void close_connections(void)
#endif
end_thr_alarm(0); // Abort old alarms.
while (CONNECT::count)
my_sleep(100);
/*
First signal all threads that it's time to die
This will give the threads some time to gracefully abort their
@@ -1741,9 +1744,9 @@ static void close_connections(void)
much smaller than even 2 seconds, this is only a safety fallback against
stuck threads so server shutdown is not held up forever.
*/
DBUG_PRINT("info", ("thread_count: %u", uint32_t(thread_count)));
DBUG_PRINT("info", ("THD_count: %u", THD_count::value()));
for (int i= 0; (thread_count - binlog_dump_thread_count) && i < 1000; i++)
for (int i= 0; (THD_count::value() - binlog_dump_thread_count) && i < 1000; i++)
my_sleep(20000);
if (global_system_variables.log_warnings)
@@ -1756,15 +1759,14 @@ static void close_connections(void)
}
#endif
/* All threads has now been aborted */
DBUG_PRINT("quit", ("Waiting for threads to die (count=%u)",
uint32_t(thread_count)));
DBUG_PRINT("quit", ("Waiting for threads to die (count=%u)", THD_count::value()));
while (thread_count - binlog_dump_thread_count)
while (THD_count::value() - binlog_dump_thread_count)
my_sleep(1000);
/* Kill phase 2 */
server_threads.iterate(kill_thread_phase_2);
for (uint64 i= 0; thread_count; i++)
for (uint64 i= 0; THD_count::value(); i++)
{
/*
This time the warnings are emitted within the loop to provide a
@@ -7694,7 +7696,7 @@ static int mysql_init_variables(void)
mqh_used= 0;
cleanup_done= 0;
test_flags= select_errors= dropping_tables= ha_open_options=0;
thread_count= 0;
THD_count::count= CONNECT::count= 0;
slave_open_temp_tables= 0;
opt_endinfo= using_udf_functions= 0;
opt_using_transactions= 0;