From 648eda9262f38095b881db1ffe16c8f8fa2a9922 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 11 Jun 2019 16:57:58 +0300 Subject: [PATCH] Remove deprecated parameters from MariaDBMon Also deprecates an unused parameter. --- server/modules/monitor/mariadbmon/mariadbmon.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc index ea14e7c72..d29b7a3c9 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.cc +++ b/server/modules/monitor/mariadbmon/mariadbmon.cc @@ -998,7 +998,8 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE() NULL, /* Thread finish. */ { { - "detect_replication_lag", MXS_MODULE_PARAM_BOOL, "false" + "detect_replication_lag", MXS_MODULE_PARAM_BOOL, "false", + MXS_MODULE_OPT_DEPRECATED }, { "detect_stale_master", MXS_MODULE_PARAM_BOOL, "true" @@ -1006,24 +1007,12 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE() { "detect_stale_slave", MXS_MODULE_PARAM_BOOL, "true" }, - { - "mysql51_replication", MXS_MODULE_PARAM_BOOL, "false", - MXS_MODULE_OPT_DEPRECATED - }, - { - "multimaster", MXS_MODULE_PARAM_BOOL, "false", - MXS_MODULE_OPT_DEPRECATED - }, { CN_DETECT_STANDALONE_MASTER, MXS_MODULE_PARAM_BOOL, "true" }, { CN_FAILCOUNT, MXS_MODULE_PARAM_COUNT, "5" }, - { - "allow_cluster_recovery", MXS_MODULE_PARAM_BOOL, "true", - MXS_MODULE_OPT_DEPRECATED - }, { "ignore_external_masters", MXS_MODULE_PARAM_BOOL, "false" },