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-21 14:18:15 +03:00
parent 2ab748dbab d55c07dc2e
commit e5a0b4e9bb
5 changed files with 117 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,22 +878,16 @@ static int gw_read_and_write(DCB* dcb)
proto->collect_result = false;
result_collected = true;
}
else if (expecting_ps_response(proto))
else if (expecting_ps_response(proto)
&& mxs_mysql_is_prep_stmt_ok(read_buffer)
&& !complete_ps_response(read_buffer))
{
if (mxs_mysql_is_prep_stmt_ok(read_buffer)
&& !complete_ps_response(read_buffer))
{
dcb_readq_prepend(dcb, read_buffer);
return 0;
}
// Collected the complete result
proto->collect_result = false;
result_collected = true;
dcb_readq_prepend(dcb, read_buffer);
return 0;
}
else
{
// Assume that everything else responds with an single packet
// Collected the complete result
proto->collect_result = false;
result_collected = true;
}