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

Rename misleading function

Browse Source 
The expecting resultset function does not expect a resultset but a text
protocol result.
This commit is contained in:
Markus Mäkelä
2018-09-11 08:07:22 +03:00
parent e15b0e2147
commit d7b7f43efb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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