diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
| commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
| tree | 406c71091eb4fdf4409147d22e6749309f677e8e /sql/sql_class.cc | |
| parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
| parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
| download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 494498cad55..38770a24dec 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -71,6 +71,7 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#include "repl_failsafe.h" /* The following is used to initialise Table_ident with a internal @@ -1417,6 +1418,10 @@ void THD::cleanup(void) DBUG_ASSERT(!mdl_context.has_locks()); apc_target.destroy(); +#ifdef HAVE_REPLICATION + unregister_slave(this, true, true); +#endif + cleanup_done=1; DBUG_VOID_RETURN; } |