Merge branch '2.2' into 2.2-mrm

2017-10-30 11:06:34 +02:00
parent 41cd0cd6d7 a971aa25da
commit 3a78b716b8
49 changed files with 1458 additions and 500 deletions
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@ -2511,6 +2511,14 @@ static void enable_log_priority(DCB *dcb, char *arg1)
    if (priority != -1)
    {
        mxs_log_set_priority_enabled(priority, true);
+
+#if !defined(SS_DEBUG)
+        if (priority == LOG_DEBUG)
+        {
+            dcb_printf(dcb,
+                       "Enabling '%s' has no effect, as MaxScale has been built in release mode.\n", arg1);
+        }
+#endif
    }
    else
    {