1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge of patch for MDEV-6411 from maria-5.5-galera.

This commit is contained in:
Nirbhay Choubey
2014-07-09 11:07:23 -04:00
parent 3d1ac12177
commit dc377fcbc0
8 changed files with 94 additions and 27 deletions

View File

@@ -720,7 +720,7 @@ void wsrep_init_startup (bool first)
}
void wsrep_deinit()
void wsrep_deinit(bool free_options)
{
DBUG_ASSERT(wsrep_inited == 1);
wsrep_unload(wsrep);
@@ -729,6 +729,11 @@ void wsrep_deinit()
provider_version[0]= '\0';
provider_vendor[0]= '\0';
wsrep_inited= 0;
if (free_options)
{
wsrep_sst_auth_free();
}
}
void wsrep_recover()