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

MXS-2200 Store server version string and type in internal class

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-17 18:31:06 +02:00
parent 54ae7119cf
commit d1b098d3b0
3 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/core/server.cc
View File

@ -1502,14 +1502,36 @@ void Server::VersionInfo::set(uint64_t version, const std::string& version_str)
major = version / 10000;
minor = (version - major * 10000) / 100;
patch = version - major * 10000 - minor * 100;
m_version.major = major;
m_version.minor = minor;
m_version.patch = patch;
bool is_mariadb = (strcasestr(version_str.c_str(), "mariadb") != NULL);
m_type = is_mariadb ? SERVER_TYPE_MARIADB : SERVER_TYPE_MYSQL;
m_version_num.major = major;
m_version_num.minor = minor;
m_version_num.patch = patch;
careful_strcpy(m_version_str, MAX_VERSION_LEN, version_str);
if (strcasestr(version_str.c_str(), "clustrix") != NULL)
{
m_type = Type::CLUSTRIX;
}
else if (strcasestr(version_str.c_str(), "mariadb") != NULL)
{
m_type = Type::MARIADB;
}
else
{
m_type = Type::MYSQL;
}
}
Server::Version Server::VersionInfo::get() const
Server::Version Server::VersionInfo::version_num() const
{
return m_version;
return m_version_num;
}
Server::Type Server::VersionInfo::type() const
{
return m_type;
}
std::string Server::VersionInfo::version_string() const
{
return m_version_str;
}