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

MXS-1859 Correct merge bug

Browse Source 
Version comparison was wrong.
This commit is contained in:
Esa Korhonen
2018-05-21 11:16:10 +03:00
parent 0f8bf9b6e2
commit 043232990c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -1557,7 +1557,7 @@ void MariaDBMonitor::enforce_read_only_on_slaves()
{ {
MariaDBServer* server = *iter; MariaDBServer* server = *iter;
if (server->is_slave() && !server->m_read_only && if (server->is_slave() && !server->m_read_only &&
!(server->m_version != MariaDBServer::version::BINLOG_ROUTER)) (server->m_version != MariaDBServer::version::BINLOG_ROUTER))
{ {
MYSQL* conn = server->m_server_base->con; MYSQL* conn = server->m_server_base->con;
if (mxs_mysql_query(conn, QUERY) == 0) if (mxs_mysql_query(conn, QUERY) == 0)