hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-09-14 10:38:26 +03:00
parent 8c561c6e55 c600b8ab92
commit 4e41978069
8 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -132,6 +132,8 @@ static void blr_start_master(void* data)
if (router->client)
{
MXS_FREE(router->client->data);
router->client->data = NULL;
dcb_close(router->client);
router->client = NULL;
}
@ -1518,13 +1520,13 @@ int blr_check_heartbeat(ROUTER_INSTANCE* router)
static void blr_log_identity(ROUTER_INSTANCE* router)
{
char* master_uuid;
char* master_hostname;
char* master_version;
char* master_uuid = NULL;
char* master_hostname = NULL;
char* master_version = NULL;
if (router->set_master_version)
{
master_version = router->set_master_version;
master_version = MXS_STRDUP(router->set_master_version);
}
else
{
@ -1533,16 +1535,16 @@ static void blr_log_identity(ROUTER_INSTANCE* router)
if (router->set_master_hostname)
{
master_hostname = router->set_master_hostname;
master_hostname = MXS_STRDUP(router->set_master_hostname);
}
else
{
master_hostname = blr_extract_column(router->saved_master.selecthostname, 1);
}
if (router->set_master_uuid)
if (router->set_master_uuid && router->master_uuid)
{
master_uuid = router->master_uuid;
master_uuid = MXS_STRDUP(router->master_uuid);
}
else
{
@ -1583,6 +1585,10 @@ static void blr_log_identity(ROUTER_INSTANCE* router)
(master_hostname == NULL ? "not available" : master_hostname),
(master_version == NULL ? "not available" : master_version));
}
MXS_FREE(master_version);
MXS_FREE(master_hostname);
MXS_FREE(master_uuid);
}
/**