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

Fix compilation error

Browse Source 
A variable had the same name as a type, which confused some compilers.
This commit is contained in:
Esa Korhonen
2019-01-04 10:39:11 +02:00
parent ca9c52944b
commit cf9ac9004e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,9 +892,9 @@ void MariaDBServer::update_server_version()
mxs_mysql_update_server_version(srv, conn); mxs_mysql_update_server_version(srv, conn);
m_srv_type = server_type::UNKNOWN; // TODO: Use type information in SERVER directly m_srv_type = server_type::UNKNOWN; // TODO: Use type information in SERVER directly
auto server_type = srv->type(); auto base_server_type = srv->type();
MYSQL_RES* result; MYSQL_RES* result;
if (server_type == SERVER::Type::CLUSTRIX) if (base_server_type == SERVER::Type::CLUSTRIX)
{ {
m_srv_type = server_type::CLUSTRIX; m_srv_type = server_type::CLUSTRIX;
} }
@ -919,7 +919,7 @@ void MariaDBServer::update_server_version()
{ {
m_capabilities.basic_support = true; m_capabilities.basic_support = true;
// For more specific features, at least MariaDB 10.X is needed. // For more specific features, at least MariaDB 10.X is needed.
if (server_type == SERVER::Type::MARIADB && major >= 10) if (base_server_type == SERVER::Type::MARIADB && major >= 10)
{ {
// 10.0.2 or 10.1.X or greater than 10 // 10.0.2 or 10.1.X or greater than 10
if (((minor == 0 && patch >= 2) || minor >= 1) || major > 10) if (((minor == 0 && patch >= 2) || minor >= 1) || major > 10)