From 9b2748f50c85081dc0ca3871d23b2daad3d7d027 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 2 Mar 2016 08:38:59 +0200 Subject: [PATCH] Removed false warnings about readwritesplit parameter types The warning was expecting the wrong return value and mistakenly interpreted that the setting of the parameter failed. --- server/core/config.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/server/core/config.c b/server/core/config.c index f71b27f2c..cabf82c4c 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -2345,15 +2345,12 @@ int create_new_service(CONFIG_CONTEXT *obj) if ((param = config_get_param(obj->parameters, "use_sql_variables_in"))) { - if (service_set_param_value(obj->element, param, param->value, + if (!service_set_param_value(obj->element, param, param->value, COUNT_NONE, SQLVAR_TARGET_TYPE)) { - if (param) - { - MXS_WARNING("Invalid value type for parameter \'%s.%s = %s\'\n\tExpected " - "type is [master|all] for use sql variables in.", - service->name, param->name, param->value); - } + MXS_WARNING("Invalid value type for parameter \'%s.%s = %s\'\n\tExpected " + "type is [master|all] for use sql variables in.", + service->name, param->name, param->value); } } }