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/auroramon/auroramon.c
+++ b/server/modules/monitor/auroramon/auroramon.c
@ -79,7 +79,7 @@ void update_server_status(MXS_MONITOR *monitor, MXS_MONITOR_SERVERS *database)
            }
            else
            {
-                MXS_ERROR("Failed to query server %s (%s:%d): %d, %s",
+                MXS_ERROR("Failed to query server %s ([%s]:%d): %d, %s",
                          database->server->unique_name, database->server->name,
                          database->server->port, mysql_errno(database->con),
                          mysql_error(database->con));