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

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
{