From c8078c99e567dcf79ac56ffdc2b9adacd904c737 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 11 Mar 2019 14:24:49 +0200 Subject: [PATCH] MXS-2325 Fix Debian 8 compilation --- server/modules/monitor/mariadbmon/cluster_manipulation.cc | 3 ++- server/modules/monitor/mariadbmon/server_utils.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/modules/monitor/mariadbmon/cluster_manipulation.cc b/server/modules/monitor/mariadbmon/cluster_manipulation.cc index b0567ab88..3db3dcd96 100644 --- a/server/modules/monitor/mariadbmon/cluster_manipulation.cc +++ b/server/modules/monitor/mariadbmon/cluster_manipulation.cc @@ -1701,7 +1701,8 @@ MariaDBMonitor::switchover_prepare(SERVER* promotion_server, SERVER* demotion_se m_promote_sql_file, demotion_target->m_slave_status, demotion_target->m_enabled_events); ServerOperation demotion(demotion_target, master_swap, m_handle_event_scheduler, - m_demote_sql_file, promotion_target->m_slave_status, {} /* unused */); + m_demote_sql_file, promotion_target->m_slave_status, + EventNameSet() /* unused */); GeneralOpData general(m_replication_user, m_replication_password, error_out, time_limit); rval.reset(new SwitchoverParams(promotion, demotion, general)); } diff --git a/server/modules/monitor/mariadbmon/server_utils.cc b/server/modules/monitor/mariadbmon/server_utils.cc index 072dcb2d1..d48533704 100644 --- a/server/modules/monitor/mariadbmon/server_utils.cc +++ b/server/modules/monitor/mariadbmon/server_utils.cc @@ -169,7 +169,8 @@ ServerOperation::ServerOperation(MariaDBServer* target, bool was_is_master, bool ServerOperation::ServerOperation(MariaDBServer* target, bool was_is_master, bool handle_events, const std::string& sql_file) - : ServerOperation(target, was_is_master, handle_events, sql_file, {}, {}) + : ServerOperation(target, was_is_master, handle_events, sql_file, + SlaveStatusArray() /* empty */, EventNameSet() /* empty */) { }