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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-09-12 22:14:56 +03:00
parent 12092d1a90 e1f2b81734
commit 7ec2f77708
21 changed files with 254 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -667,7 +667,7 @@ static inline bool session_ok_to_route(DCB* dcb)
return rval;
}
static inline bool expecting_resultset(MySQLProtocol* proto)
static inline bool expecting_text_result(MySQLProtocol* proto)
{
return proto->current_command == MXS_COM_QUERY
|| proto->current_command == MXS_COM_STMT_EXECUTE
@ -861,7 +861,7 @@ static int gw_read_and_write(DCB* dcb)
if (collecting_resultset(proto, capabilities))
{
if (expecting_resultset(proto))
if (expecting_text_result(proto))
{
if (mxs_mysql_is_result_set(read_buffer))
{