diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2022-08-09 19:28:49 +0300 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2022-08-09 20:12:07 +0300 |
| commit | 9df047f264db3a114026849d64b691d1301d8109 (patch) | |
| tree | 89d78b5221e8687b443b6863884b57659b1d69a3 /sql/mysqld.cc | |
| parent | 373a00fea0ec8b1c949f90b2fc407b40035be4cc (diff) | |
| download | mariadb-git-bb-10.10-MDEV-28883.tar.gz | |
MDEV-24660 MYSQL_BIN_LOG::cleanup(): Assertion `b->xid_count == 0'bb-10.10-MDEV-28883
The assert fired at shutdown time to indicate a missed decrement to
the count. The counter could not have been decremented because
the binlog background thread had already gone.
Fixed with relocation the binlog background thread exit in the server
shutdown module.
Diffstat (limited to 'sql/mysqld.cc')
| -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 1e30d8f3644..d60eeb34962 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1781,7 +1781,6 @@ static void close_connections(void) Events::deinit(); slave_prepare_for_shutdown(); - mysql_bin_log.stop_background_thread(); ack_receiver.stop(); /* @@ -1965,6 +1964,7 @@ static void clean_up(bool print_message) logger.cleanup_base(); injector::free_instance(); + mysql_bin_log.stop_background_thread(); mysql_bin_log.cleanup(); my_tz_free(); |