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ä
2020-01-24 09:48:05 +02:00
parent 51deebc44f 4641dc208f
commit 17916969b6
4 changed files with 124 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
View File

@ -67,7 +67,7 @@ static void discard_if_response_differs(RWBackend* backend,
uint8_t slave_response,
SSessionCommand sescmd)
{
if (master_response != slave_response)
if (master_response != slave_response && backend->in_use())
{
uint8_t cmd = sescmd->get_command();
std::string query = sescmd->to_string();
@ -88,7 +88,6 @@ void RWSplitSession::process_sescmd_response(RWBackend* backend, GWBUF** ppPacke
{
if (backend->has_session_commands())
{
mxb_assert(GWBUF_IS_COLLECTED_RESULT(*ppPacket));
uint8_t cmd;
gwbuf_copy_data(*ppPacket, MYSQL_HEADER_LEN, 1, &cmd);
uint8_t command = backend->next_session_command()->get_command();
@ -97,6 +96,8 @@ void RWSplitSession::process_sescmd_response(RWBackend* backend, GWBUF** ppPacke
MXS_PS_RESPONSE resp = {};
bool discard = true;
mxb_assert(GWBUF_IS_COLLECTED_RESULT(*ppPacket) || command == MXS_COM_CHANGE_USER);
if (command == MXS_COM_STMT_PREPARE && cmd != MYSQL_REPLY_ERR)
{
// This should never fail or the backend protocol is broken