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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-06-28 10:34:41 +03:00
parent b5fdcf66ab c33837c906
commit dc4a555c70
6 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/backend.cc
View File

@ -97,7 +97,7 @@ bool Backend::execute_session_command()
case MXS_COM_STMT_CLOSE:
case MXS_COM_STMT_SEND_LONG_DATA:
/** These commands do not generate responses */
rval = Backend::write(buffer, NO_RESPONSE);
rval = write(buffer, NO_RESPONSE);
complete_session_command();
ss_dassert(!is_waiting_result());
break;
@ -113,7 +113,7 @@ bool Backend::execute_session_command()
// TODO: Remove use of GWBUF_TYPE_SESCMD
//Mark session command buffer, it triggers writing MySQL command to protocol
gwbuf_set_type(buffer, GWBUF_TYPE_SESCMD);
rval = Backend::write(buffer);
rval = write(buffer, EXPECT_RESPONSE);
ss_dassert(is_waiting_result());
break;
}
@ -221,6 +221,7 @@ bool Backend::write(GWBUF* buffer, response_type type)
bool Backend::auth(GWBUF* buffer)
{
ss_dassert(in_use());
bool rval = false;
if (m_dcb->func.auth(m_dcb, NULL, m_dcb->session, buffer) == 1)
@ -245,6 +246,7 @@ void Backend::store_command(GWBUF* buffer)
bool Backend::write_stored_command()
{
ss_dassert(in_use());
bool rval = false;
if (m_pending_cmd.length())

12
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -746,8 +746,15 @@ SRWBackend RWSplitSession::handle_slave_is_target(uint8_t cmd, uint32_t stmt_id)
if (it != m_exec_map.end())
{
target = it->second;
MXS_INFO("COM_STMT_FETCH on %s (%s)", target->name(), target->uri());
if (it->second->in_use())
{
target = it->second;
MXS_INFO("COM_STMT_FETCH on %s", target->uri());
}
else
{
MXS_INFO("Old target not in use, cannot proceed");
}
}
else
{
@ -763,6 +770,7 @@ SRWBackend RWSplitSession::handle_slave_is_target(uint8_t cmd, uint32_t stmt_id)
if (target)
{
atomic_add_uint64(&m_router->stats().n_slave, 1);
ss_dassert(target->in_use());
}
else
{