Merge branch '2.1' into develop

2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c
@ -349,7 +349,7 @@ monitorMain(void *arg)
            if (ptr->server->status != ptr->mon_prev_status ||
                SERVER_IS_DOWN(ptr->server))
            {
-                MXS_DEBUG("Backend server %s:%d state : %s",
+                MXS_DEBUG("Backend server [%s]:%d state : %s",
                          ptr->server->name,
                          ptr->server->port,
                          STRSRVSTATUS(ptr->server));