Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-09-21 14:18:15 +03:00
5 changed files with 117 additions and 115 deletions

View File

@ -406,7 +406,11 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
bool expecting_response = mxs_mysql_command_will_respond(command);
int nsucc = 0;
uint64_t lowest_pos = id;
gwbuf_set_type(querybuf, GWBUF_TYPE_COLLECT_RESULT);
if (expecting_response)
{
gwbuf_set_type(querybuf, GWBUF_TYPE_COLLECT_RESULT);
}
if (qc_query_is_type(type, QUERY_TYPE_PREPARE_NAMED_STMT)
|| qc_query_is_type(type, QUERY_TYPE_PREPARE_STMT))