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

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

Browse Source 
We will continue to look for "clustrix" as well so that MaxScale
will continue to work with older releases. Clustrix was replaced with
xpand in all symbols.
This commit is contained in:
Johan Wikman
2020-11-17 13:25:13 +02:00
parent 10582a02fe
commit 4728730510
5 changed files with 26 additions and 25 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::CLUSTRIX)
if (m_srv_type == server_type::XPAND)
{
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::CLUSTRIX)
if (base_server_type == SERVER::Type::XPAND)
{
m_srv_type = server_type::CLUSTRIX;
m_srv_type = server_type::XPAND;
}
// Check whether this server is a MaxScale Binlog Server.
else if (mxs_mysql_query(conn, "SELECT @@maxscale_version") == 0

2
server/modules/monitor/mariadbmon/mariadbserver.hh
View File

@ -89,7 +89,7 @@ public:
UNKNOWN, /* Totally unknown. Server has not been connected to yet. */
NORMAL, /* A normal MariaDB/MySQL server, possibly supported. */
BINLOG_ROUTER, /* MaxScale binlog server. Requires special handling. */
CLUSTRIX /* Clustrix server. Requires special handling. */
XPAND /* Xpand server. Requires special handling. */
};
enum class BinlogMode