1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19457 sys_vars.wsrep_provider_basic failed

Browse Source 
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.
This commit is contained in:
Marko Mäkelä 2019-11-01 14:28:33 +02:00
parent 366f4f299e
commit 6801f80afa
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/wsrep_mysqld.cc
View File

@ -627,6 +627,7 @@ static wsrep::gtid wsrep_server_initial_position()
*/ */
static void wsrep_init_provider_status_variables() static void wsrep_init_provider_status_variables()
{ {
wsrep_inited= 1;
const wsrep::provider& provider= const wsrep::provider& provider=
Wsrep_server_state::instance().provider(); Wsrep_server_state::instance().provider();
strncpy(provider_name, strncpy(provider_name,
@ -711,9 +712,7 @@ int wsrep_init()
WSREP_ERROR("wsrep::init() failed: %d, must shutdown", err); WSREP_ERROR("wsrep::init() failed: %d, must shutdown", err);
} }
else else
{
wsrep_init_provider_status_variables(); wsrep_init_provider_status_variables();
}
return err; return err;
} }
@ -749,7 +748,6 @@ int wsrep_init()
Wsrep_server_state::instance().unload_provider(); Wsrep_server_state::instance().unload_provider();
return 1; return 1;
} }
wsrep_inited= 1;
wsrep_init_provider_status_variables(); wsrep_init_provider_status_variables();
wsrep_capabilities_export(Wsrep_server_state::instance().provider().capabilities(), wsrep_capabilities_export(Wsrep_server_state::instance().provider().capabilities(),