1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '10.1' into 10.2

This commit is contained in:
Oleksandr Byelkin
2020-05-02 08:44:17 +02:00
49 changed files with 2951 additions and 2635 deletions

View File

@ -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;
}