Merge remote-tracking branch 'origin/2.3' into 2.3

2019-03-05 04:59:26 +02:00
parent 77ef3dd613 4fd4b726a1
commit 6332f0876b
8 changed files with 151 additions and 94 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -79,7 +79,8 @@ void MariaDBMonitor::reset_server_info()
    // Next, initialize the data.
    for (auto mon_server = m_monitor->monitored_servers; mon_server; mon_server = mon_server->next)
    {
-        m_servers.push_back(new MariaDBServer(mon_server, m_servers.size(), m_assume_unique_hostnames));
+        m_servers.push_back(new MariaDBServer(mon_server, m_servers.size(),
+                            m_assume_unique_hostnames, m_handle_event_scheduler));
    }
 }