Merge branch '2.3' into 2.4
This commit is contained in:
@ -1234,7 +1234,6 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
|
||||
MXS_INFO("COM_QUIT received while COM_CHANGE_USER is in progress, closing pooled connection");
|
||||
gwbuf_free(queue);
|
||||
poll_fake_hangup_event(dcb);
|
||||
rc = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1246,9 +1245,8 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
|
||||
*/
|
||||
MXS_INFO("COM_CHANGE_USER in progress, appending query to queue");
|
||||
backend_protocol->stored_query = gwbuf_append(backend_protocol->stored_query, queue);
|
||||
rc = 1;
|
||||
}
|
||||
return rc;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user