From 6801f80aface011811d2978f86c03a25ca7b9165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 1 Nov 2019 14:28:33 +0200 Subject: [PATCH] MDEV-19457 sys_vars.wsrep_provider_basic failed wsrep_init_provider_status_variables(): Always set wsrep_inited to ensure that the memory will be freed. The initial patch was provided by Julius Goryavsky. --- sql/wsrep_mysqld.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 2ccb94e9528..bc0c1ab20e3 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -627,6 +627,7 @@ static wsrep::gtid wsrep_server_initial_position() */ static void wsrep_init_provider_status_variables() { + wsrep_inited= 1; const wsrep::provider& provider= Wsrep_server_state::instance().provider(); strncpy(provider_name, @@ -711,9 +712,7 @@ int wsrep_init() WSREP_ERROR("wsrep::init() failed: %d, must shutdown", err); } else - { wsrep_init_provider_status_variables(); - } return err; } @@ -749,7 +748,6 @@ int wsrep_init() Wsrep_server_state::instance().unload_provider(); return 1; } - wsrep_inited= 1; wsrep_init_provider_status_variables(); wsrep_capabilities_export(Wsrep_server_state::instance().provider().capabilities(),