Merge branch '2.2' into develop

2018-05-16 09:31:13 +03:00
parent 30cce333fd b5888d8950
commit 7e9062f20f
37 changed files with 380 additions and 419 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -3545,7 +3545,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
        {
            MXS_NOTICE("Monitor '%s' is missing the '%s' parameter, "
                       "using default value of %d milliseconds.",
-                       CN_MONITOR_INTERVAL, obj->object, DEFAULT_MONITOR_INTERVAL);
+                       obj->object, CN_MONITOR_INTERVAL, DEFAULT_MONITOR_INTERVAL);
        }

        char *journal_age = config_get_value(obj->parameters, CN_JOURNAL_MAX_AGE);