Merge branch '2.3' into develop

2019-03-04 17:43:53 +02:00
parent c2459c420d 4fd4b726a1
commit 83fc3b1bc2
9 changed files with 178 additions and 103 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -80,7 +80,8 @@ void MariaDBMonitor::reset_server_info()
    // Next, initialize the data.
    for (auto mon_server : Monitor::m_servers)
    {
-        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));
    }
 }