MXS-1775 m_master is now a member variable of MonitorInstance

2018-05-17 13:56:03 +03:00
parent 5aa30e8613
commit db30ea96f2
10 changed files with 11 additions and 18 deletions
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.cc
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.cc
@ -73,7 +73,6 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 NDBCMonitor::NDBCMonitor(MXS_MONITOR *monitor)
    : maxscale::MonitorInstance(monitor)
    , m_id(MXS_MONITOR_DEFAULT_ID)
-    , m_master(NULL)
 {
 }

--- a/server/modules/monitor/ndbclustermon/ndbclustermon.hh
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
@ -32,8 +32,7 @@ public:
    json_t* diagnostics_json() const;

 private:
-    unsigned long m_id;             /**< Monitor ID */
-    MXS_MONITORED_SERVER *m_master; /**< Master server for MySQL Master/Slave replication */
+    unsigned long m_id; /**< Monitor ID */

    NDBCMonitor(MXS_MONITOR* monitor);
    ~NDBCMonitor();