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

Small fixes

Browse Source 
Small fixes
This commit is contained in:
MassimilianoPinto
2015-09-15 16:50:15 +02:00
parent 374056cecc
commit c12233db0d
1 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/binlog/blr_master.c
View File

@ -541,10 +541,12 @@ char task_name[BLRM_TASK_NAME_LEN + 1] = "";
free(key);
/* set the master_uuid from master if not set by the option */
if (router->set_master_uuid == NULL)
if (router->set_master_uuid == NULL) {
free(router->master_uuid);
router->master_uuid = val;
else
} else {
router->master_uuid = router->set_master_uuid;
}
// Response to the SERVER_UUID, should be stored
if (router->saved_master.uuid)
@ -2082,6 +2084,12 @@ char *event_desc = NULL;
return 1;
}
/**
* Log binlog router identy after master registration, state is BLRM_BINLOG_DUMP
*
* @param router The router instance
*/
static void blr_log_identity(ROUTER_INSTANCE *router) {
char *master_uuid;
@ -2093,17 +2101,20 @@ static void blr_log_identity(ROUTER_INSTANCE *router) {
else {
master_version = blr_extract_column(router->saved_master.selectver, 1);
}
if (router->set_master_hostname)
master_hostname = router->set_master_hostname;
else {
master_hostname = blr_extract_column(router->saved_master.selecthostname, 1);
}
if (router->set_master_uuid)
master_uuid = router->master_uuid;
else {
master_uuid = blr_extract_column(router->saved_master.uuid, 2);
}
/* Seen by the master */
LOGIF(LT, (skygw_log_write_flush(
LOGFILE_TRACE,
"%s: identity seen by the master: "
@ -2111,6 +2122,8 @@ static void blr_log_identity(ROUTER_INSTANCE *router) {
router->service->name,
router->serverid, (router->uuid == NULL ? "not available" : router->uuid))));
/* Seen by the slaves */
/* MariaDB 5.5 and MariaDB don't have the MASTER_UUID var */
if (master_uuid == NULL) {
LOGIF(LT, (skygw_log_write_flush(
@ -2131,3 +2144,4 @@ static void blr_log_identity(ROUTER_INSTANCE *router) {
(master_version == NULL ? "not available" : master_version))));
}
}