Fix rebase error.

This commit is contained in:
Johan Wikman 2018-05-18 14:43:09 +03:00
parent 9d526332d8
commit f3973b331f

View File

@ -595,7 +595,7 @@ MXS_MONITORED_SERVER *GaleraMonitor::get_candidate_master()
}
}
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
if (min_id < 0 || moitor_servers->server->node_id < min_id)