From 7c21eb3ec431050fbba43e51220cd9ff26f228da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 23 Nov 2017 17:26:44 +0200 Subject: [PATCH] Do not force router_options usage The usage of the router_options has become optional in 2.1. This means that the binlogrouter should not fail to start if no router_options are defined. Also lowered the error about master.ini to a warning as it is expected to happen on a fresh installation. --- server/modules/routing/binlogrouter/blr.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/server/modules/routing/binlogrouter/blr.c b/server/modules/routing/binlogrouter/blr.c index e091f188f..890dea8bb 100644 --- a/server/modules/routing/binlogrouter/blr.c +++ b/server/modules/routing/binlogrouter/blr.c @@ -242,13 +242,6 @@ createInstance(SERVICE *service, char **options) return NULL; } - if (options == NULL || options[0] == NULL) - { - MXS_ERROR("%s: Error: No router options supplied for binlogrouter", - service->name); - return NULL; - } - /* * We only support one server behind this router, since the server is * the master from which we replicate binlog records. Therefore check @@ -623,10 +616,6 @@ createInstance(SERVICE *service, char **options) } } } - else - { - MXS_ERROR("%s: Error: No router options supplied for binlogrouter", service->name); - } if (inst->masterid) { @@ -754,10 +743,10 @@ createInstance(SERVICE *service, char **options) { if (rc == -1) { - MXS_ERROR("%s: master.ini file not found in %s." - " Master registration cannot be started." - " Configure with CHANGE MASTER TO ...", - inst->service->name, inst->binlogdir); + MXS_WARNING("%s: master.ini file not found in %s." + " Master registration cannot be started." + " Configure with CHANGE MASTER TO ...", + inst->service->name, inst->binlogdir); } else {