diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2022-01-24 19:51:27 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2022-01-24 19:51:27 +0400 |
| commit | e160accd8dc61ca1eae307c77ed683da297c1863 (patch) | |
| tree | f1f562a89b87648e917acbf5a0f7e3ad79a87bbf | |
| parent | 9620aacf0e8ff99b656e551fee3905f8bd5017f6 (diff) | |
| download | mariadb-git-e160accd8dc61ca1eae307c77ed683da297c1863.tar.gz | |
MDEV-26890 : Crash on shutdown, with active binlog dump threads
Backported from 10.7.
The reason for the crash was a bug in MDEV-19275, after which
shutdown does not wait for binlog threads anymore.
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c17016448b6..4f8b53e8789 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1782,7 +1782,7 @@ static void close_connections(void) /* Kill phase 2 */ server_threads.iterate(kill_thread_phase_2); - for (uint64 i= 0; THD_count::connection_thd_count(); i++) + for (uint64 i= 0; THD_count::value() > local_connection_thread_count; i++) { /* This time the warnings are emitted within the loop to provide a |