From 040587c82830eb4544ebfcd7b2866e6bf9956c2f Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 16 Oct 2015 22:30:08 +0300 Subject: [PATCH] Fix to MXS-413: https://mariadb.atlassian.net/browse/MXS-413 Added missing terminating newlines so showSession and improved maxadmin logic. --- client/maxadmin.c | 3 ++- server/core/session.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/maxadmin.c b/client/maxadmin.c index dec941d2f..6f8899163 100644 --- a/client/maxadmin.c +++ b/client/maxadmin.c @@ -466,7 +466,8 @@ int i, j, newline = 1; { if (newline == 1 && buf[j] == 'O') newline = 2; - else if (newline == 2 && buf[j] == 'K' && j == i - 1) + else if ((newline == 2 && buf[j] == 'K' && j == i - 1) || + (j == i - 2 && buf[j] == 'O' && buf[j + 1] == 'K')) { return 1; } diff --git a/server/core/session.c b/server/core/session.c index e9d45b8e7..7a2429bd0 100644 --- a/server/core/session.c +++ b/server/core/session.c @@ -715,11 +715,11 @@ int i; ptr->client->user?ptr->client->user:"", ptr->client->user?"@":"", ptr->client->remote); - dcb_printf(dcb, "\tConnected: %s", + dcb_printf(dcb, "\tConnected: %s\n", asctime_r(localtime_r(&ptr->stats.connect, &result), buf)); if(ptr->client->state == DCB_STATE_POLLING) { - dcb_printf(dcb, "\tIdle: %.0f seconds",idle); + dcb_printf(dcb, "\tIdle: %.0f seconds\n",idle); } }