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

Fix rebase error.

Browse Source
This commit is contained in:
Johan Wikman
2018-05-18 14:43:09 +03:00
parent 9d526332d8
commit f3973b331f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,7 +595,7 @@ MXS_MONITORED_SERVER *GaleraMonitor::get_candidate_master()
} }
} }
else if (moitor_servers->server->node_id >= 0 && else if (moitor_servers->server->node_id >= 0 &&
(!handle->use_priority || candidate_master == NULL)) (!m_use_priority || candidate_master == NULL))
{ {
// Server priorities are not in use or no candidate has been found // Server priorities are not in use or no candidate has been found
if (min_id < 0 || moitor_servers->server->node_id < min_id) if (min_id < 0 || moitor_servers->server->node_id < min_id)