Merge branch '2.2' into 2.2-mrm

2017-10-02 15:49:08 +03:00
parent a81d85fba2 68432bbaa3
commit 438b4e0341
16 changed files with 220 additions and 195 deletions
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -985,9 +985,9 @@ bool runtime_destroy_monitor(MXS_MONITOR *monitor)
    {
        monitorStop(monitor);

-        while (monitor->databases)
+        while (monitor->monitored_servers)
        {
-            monitorRemoveServer(monitor, monitor->databases->server);
+            monitorRemoveServer(monitor, monitor->monitored_servers->server);
        }
        monitorDestroy(monitor);
        MXS_NOTICE("Destroyed monitor '%s'", monitor->name);