diff options
author | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
commit | c2a7dffc573f311029ed4696fb5bd88e5efba752 (patch) | |
tree | 9f04258d84a42954afb0b8e36486fd6f303cf90d /sql/sql_class.cc | |
parent | 520c3f69a6caed5524d3214a0339736d673c4c0c (diff) | |
parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
download | mariadb-git-10.0.tar.gz |
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 997432e3af9..1ec2d8b3c9e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -64,6 +64,7 @@ #include "sql_callback.h" #include "lock.h" #include "sql_connect.h" +#include "repl_failsafe.h" /* The following is used to initialise Table_ident with a internal @@ -1535,6 +1536,7 @@ THD::~THD() if (rgi_slave) rgi_slave->cleanup_after_session(); my_free(semisync_info); + unregister_slave(this, true, true); #endif free_root(&main_mem_root, MYF(0)); |