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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-27 11:46:47 +02:00
parent 0c77514aaf 631711f2bf
commit f87ff431c1
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/monitor/galeramon/galeramon.cc
View File

@ -208,22 +208,9 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
info.local_state = atoi(row[1]);
}
/* We can check:
* wsrep_local_state == 0
* wsrep_cluster_size == 0
* wsrep_cluster_state_uuid == ""
*/
if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0)
{
if (row[1] == NULL || !strlen(row[1]))
{
info.cluster_uuid.clear();
info.joined = 0;
}
else
{
info.cluster_uuid = MXS_STRDUP(row[1]);
}
info.cluster_uuid = row[1] && *row[1] ? MXS_STRDUP(row[1]) : NULL;
}
}