hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to MXS-413: https://mariadb.atlassian.net/browse/MXS-413

Browse Source 
Added missing terminating newlines so showSession and improved maxadmin logic.
This commit is contained in:
Markus Makela
2015-10-16 22:30:08 +03:00
parent 33ba9e1bae
commit 040587c828
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/maxadmin.c
View File

@ -466,7 +466,8 @@ int i, j, newline = 1;
{ {
if (newline == 1 && buf[j] == 'O') if (newline == 1 && buf[j] == 'O')
newline = 2; 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; return 1;
} }

4
server/core/session.c
View File

@ -715,11 +715,11 @@ int i;
ptr->client->user?ptr->client->user:"", ptr->client->user?ptr->client->user:"",
ptr->client->user?"@":"", ptr->client->user?"@":"",
ptr->client->remote); ptr->client->remote);
dcb_printf(dcb, "\tConnected: %s", dcb_printf(dcb, "\tConnected: %s\n",
asctime_r(localtime_r(&ptr->stats.connect, &result), buf)); asctime_r(localtime_r(&ptr->stats.connect, &result), buf));
if(ptr->client->state == DCB_STATE_POLLING) if(ptr->client->state == DCB_STATE_POLLING)
{ {
dcb_printf(dcb, "\tIdle: %.0f seconds",idle); dcb_printf(dcb, "\tIdle: %.0f seconds\n",idle);
} }
} }