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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
View File

@ -281,7 +281,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
if (so == -1)
{
MXS_ERROR("Establishing connection to backend server %s:%d failed.", host, port);
MXS_ERROR("Establishing connection to backend server [%s]:%d failed.", host, port);
return rv;
}
@ -295,7 +295,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
}
else
{
MXS_ERROR("Failed to connect backend server %s:%d due to: %d, %s.",
MXS_ERROR("Failed to connect backend server [%s]:%d due to: %d, %s.",
host, port, errno, mxs_strerror(errno));
close(so);
return rv;
@ -304,7 +304,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
*fd = so;
MXS_DEBUG("%lu [gw_do_connect_to_backend] Connected to backend server "
"%s:%d, fd %d.", pthread_self(), host, port, so);
"[%s]:%d, fd %d.", pthread_self(), host, port, so);
return rv;

6
server/modules/protocol/MySQL/mysql_common.c
View File

@ -1553,11 +1553,9 @@ bool mxs_mysql_is_result_set(GWBUF *buffer)
case MYSQL_REPLY_EOF:
/** Not a result set */
break;
default:
if (gwbuf_copy_data(buffer, MYSQL_HEADER_LEN + 1, 1, &cmd) && cmd > 1)
{
rval = true;
}
rval = true;
break;
}
}