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:
Esa Korhonen
2019-01-08 13:17:27 +02:00
parent 93aff0640c 63358fb4c1
commit 49c1afcb1b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -227,6 +227,13 @@ RWSplit* RWSplit::create(SERVICE* service, MXS_CONFIG_PARAMETER* params)
return NULL; return NULL;
} }
if (config.master_reconnection && config.disable_sescmd_history)
{
MXS_ERROR("Both 'master_reconnection' and 'disable_sescmd_history' are enabled: "
"Master reconnection cannot be done without session command history.");
return NULL;
}
return new(std::nothrow) RWSplit(service, config); return new(std::nothrow) RWSplit(service, config);
} }

3
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -1393,8 +1393,7 @@ void SchemaRouterSession::query_databases()
for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++) for (SSRBackendList::iterator it = m_backends.begin(); it != m_backends.end(); it++)
{ {
if ((*it)->in_use() && !(*it)->is_closed() if ((*it)->in_use() && !(*it)->is_closed() && server_is_usable((*it)->backend()->server))
& server_is_usable((*it)->backend()->server))
{ {
GWBUF* clone = gwbuf_clone(buffer); GWBUF* clone = gwbuf_clone(buffer);
MXS_ABORT_IF_NULL(clone); MXS_ABORT_IF_NULL(clone);