diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2018-04-16 20:34:55 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2018-04-17 11:57:59 +0300 |
| commit | 02e897ca57168059c6a74d1129158afea93aa875 (patch) | |
| tree | 40ad1aed3833bd4b54c0351c7ebc3d4f1a366a89 /sql | |
| parent | 321771f89fd84c44d99425aeb9eb6f6bf7fedb78 (diff) | |
| download | mariadb-git-02e897ca57168059c6a74d1129158afea93aa875.tar.gz | |
MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown
MDEV-13073 effectively made the master semisync component depending on
the plugin one through instantiation of THD by its Ack thread.
The thread therefore must be closing its resources prior to
plugin_shutdown(), which was not the case.
Fixed with implementing the requirement.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2db3bbe1bac..6e1a5997e15 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2240,14 +2240,14 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ item_create_cleanup(); tdc_start_shutdown(); +#ifdef HAVE_REPLICATION + semi_sync_master_deinit(); +#endif plugin_shutdown(); udf_free(); ha_end(); if (tc_log) tc_log->close(); -#ifdef HAVE_REPLICATION - semi_sync_master_deinit(); -#endif xid_cache_free(); tdc_deinit(); mdl_destroy(); |