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

5
server/core/server.cc
View File

@ -1150,10 +1150,9 @@ void Server::VersionInfo::set(uint64_t version, const std::string& version_str)
m_version_num.patch = patch;
careful_strcpy(m_version_str, MAX_VERSION_LEN, version_str);
if (strcasestr(version_str.c_str(), "xpand") != NULL
|| strcasestr(version_str.c_str(), "clustrix") != NULL)
if (strcasestr(version_str.c_str(), "clustrix") != NULL)
{
m_type = Type::XPAND;
m_type = Type::CLUSTRIX;
}
else if (strcasestr(version_str.c_str(), "mariadb") != NULL)
{