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

Revert "MXS-3301 Look for "xpand" to find out whether server is Xpand"

Browse Source 
This reverts commit 4728730510409fc15d2b3a55fa6e00008651794d.

The clustrix -> xpand name change causes too much trouble when merging
to 2.5.
This commit is contained in:
Johan Wikman
2020-11-17 17:21:14 +02:00
parent 4728730510
commit 64ca695c84
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -232,7 +232,7 @@ bool MariaDBServer::do_show_slave_status(string* errmsg_out)
unsigned int columns = 0;
string query;
bool all_slaves_status = false;
if (m_srv_type == server_type::XPAND)
if (m_srv_type == server_type::CLUSTRIX)
{
return false;
}
@ -898,9 +898,9 @@ void MariaDBServer::update_server_version()
m_srv_type = server_type::UNKNOWN; // TODO: Use type information in SERVER directly
auto base_server_type = srv->type();
MYSQL_RES* result;
if (base_server_type == SERVER::Type::XPAND)
if (base_server_type == SERVER::Type::CLUSTRIX)
{
m_srv_type = server_type::XPAND;
m_srv_type = server_type::CLUSTRIX;
}
// Check whether this server is a MaxScale Binlog Server.
else if (mxs_mysql_query(conn, "SELECT @@maxscale_version") == 0