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:
Markus Mäkelä
2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -4311,9 +4311,8 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
ssl_error = blr_set_master_ssl(router, change_master, error);
if (ssl_error != -1 &&
(!change_master.ssl_cert ||
!change_master.ssl_ca ||
!change_master.ssl_key))
// No CA cert is defined or only one of CERT or KEY is defined
(!change_master.ssl_ca || (bool)change_master.ssl_cert != (bool)change_master.ssl_key))
{
if (change_master.ssl_enabled &&
atoi(change_master.ssl_enabled))
@ -4321,7 +4320,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
snprintf(error,
BINLOG_ERROR_MSG_LEN,
"MASTER_SSL=1 but some required options are missing: "
"check MASTER_SSL_CERT, MASTER_SSL_KEY, MASTER_SSL_CA");
"check that at least MASTER_SSL_CA is defined");
ssl_error = -1;
}
}

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

@ -1133,6 +1133,7 @@ bool RWSplitSession::handle_got_target(GWBUF* querybuf, SRWBackend& target, bool
* to which the server responds with an OK or an ERR packet */
mxb_assert(gwbuf_length(querybuf) == 4);
m_qc.set_load_data_state(QueryClassifier::LOAD_DATA_INACTIVE);
session_set_load_active(m_pSession, false);
}
}
}

1
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -550,6 +550,7 @@ void RWSplitSession::clientReply(GWBUF *writebuf, DCB *backend_dcb)
{
// Server requested a local file, go into data streaming mode
m_qc.set_load_data_state(QueryClassifier::LOAD_DATA_ACTIVE);
session_set_load_active(m_pSession, true);
}
if (m_otrx_state == OTRX_ROLLBACK)