MXS-2275 Fix breakage due to rebasing

2019-02-01 09:12:39 +02:00
parent 6d60714a17
commit 55b1e031d6
5 changed files with 29 additions and 19 deletions
--- a/server/modules/monitor/clustrixmon/clustrixnode.cc
+++ b/server/modules/monitor/clustrixmon/clustrixnode.cc
@ -14,10 +14,11 @@
 #include "clustrixnode.hh"
 #include "clustrix.hh"

-bool ClustrixNode::can_be_used_as_hub(const MXS_MONITORED_SERVER::ConnectionSettings& sett)
+bool ClustrixNode::can_be_used_as_hub(const char* zName,
+                                      const MXS_MONITORED_SERVER::ConnectionSettings& settings)
 {
    mxb_assert(m_pServer);
-    bool rv = Clustrix::ping_or_connect_to_hub(sett, *m_pServer, &m_pCon);
+    bool rv = Clustrix::ping_or_connect_to_hub(zName, settings, *m_pServer, &m_pCon);

    if (!rv)
    {