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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-06-14 09:38:07 +03:00
parent 8311dba654 2accfad329
commit c819271cab
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/protocol/MySQL/rwbackend.cc
View File

@ -325,9 +325,16 @@ void RWBackend::process_packets(GWBUF* result)
break;
case REPLY_STATE_DONE:
// This should never happen
MXS_ERROR("Unexpected result state. cmd: 0x%02hhx, len: %u", cmd, len);
mxb_assert(!true);
if (cmd == MYSQL_REPLY_ERR)
{
update_error(++it, end);
}
else
{
// This should never happen
MXS_ERROR("Unexpected result state. cmd: 0x%02hhx, len: %u", cmd, len);
mxb_assert(!true);
}
break;
case REPLY_STATE_RSET_COLDEF:
@ -468,5 +475,4 @@ void RWBackend::update_error(Iter it, Iter end)
m_error.set(code, sql_state_begin, sql_state_end, message_begin, message_end);
}
}