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/grmon/grmon.cc
+++ b/server/modules/monitor/grmon/grmon.cc
@ -28,7 +28,6 @@

 GRMon::GRMon(MXS_MONITOR* monitor)
    : MonitorInstance(monitor)
-    , m_master(NULL)
 {
 }

@ -53,7 +52,6 @@ bool GRMon::has_sufficient_permissions() const

 void GRMon::configure(const MXS_CONFIG_PARAMETER* params)
 {
-    m_master = NULL;
 }

 void GRMon::diagnostics(DCB* dcb) const
--- a/server/modules/monitor/grmon/grmon.hh
+++ b/server/modules/monitor/grmon/grmon.hh
@ -32,8 +32,6 @@ public:
    json_t* diagnostics_json() const;

 private:
-    MXS_MONITORED_SERVER* m_master;   /**< The master server */
-
    GRMon(MXS_MONITOR* monitor);
    ~GRMon();