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

Merge commit 'a78f0fbe2537542dc7f3f0dd8b19b93ac8d9d7f8' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-03-28 13:53:40 +02:00
parent 18cd890474 a78f0fbe25
commit 6bc2c54081
22 changed files with 535 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/csmon/csmon.cc
View File

@ -104,10 +104,9 @@ void CsMonitor::update_server_status(MonitorServer* srv)
{
status |= SERVER_RUNNING;
if (get_cs_version(srv) >= 10107)
if (get_cs_version(srv) >= 10200)
{
// 1.1.7 should support the mcsSystemPrimary function
// TODO: Update when the actual release is out
// 1.2 supports the mcsSystemPrimary function
status |= do_query(srv, role_query) == "1" ? SERVER_MASTER : SERVER_SLAVE;
}
else