From f3973b331f6b3a1662cc4c08b8e767cd4291696b Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Fri, 18 May 2018 14:43:09 +0300 Subject: [PATCH] Fix rebase error. --- server/modules/monitor/galeramon/galeramon.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc index 50d50f981..d5cd95bf8 100644 --- a/server/modules/monitor/galeramon/galeramon.cc +++ b/server/modules/monitor/galeramon/galeramon.cc @@ -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)