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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä 2019-10-04 12:56:52 +03:00
commit 2d9d9356c9
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1859,7 +1859,6 @@ static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF
{
// TODO: Do this only when RCAP_TYPE_CONTIGUOUS_INPUT is requested
packetbuf = gwbuf_make_contiguous(packetbuf);
session_retain_statement(session, packetbuf);
MySQLProtocol* proto = (MySQLProtocol*)session->client_dcb->protocol;
@ -1869,6 +1868,11 @@ static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF
if (!proto->changing_user && !session_is_load_active(session))
{
update_current_command(session->client_dcb, packetbuf);
if (mxs_mysql_command_will_respond(proto->current_command))
{
session_retain_statement(session, packetbuf);
}
}
if (rcap_type_required(capabilities, RCAP_TYPE_CONTIGUOUS_INPUT))