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

Cleanup server version updating

Browse Source
This commit is contained in:
Esa Korhonen
2018-11-19 16:10:10 +02:00
parent 0916b58c7e
commit 01628dd0de
8 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -687,7 +687,7 @@ static bool check_server_permissions(SERVICE* service,
if (server->version_string[0] == 0)
{
mxs_mysql_set_server_version(mysql, server);
mxs_mysql_update_server_version(mysql, server);
}
const char* format = "SELECT user, host, %s, Select_priv FROM mysql.user limit 1";
@ -1010,7 +1010,7 @@ int get_users_from_server(MYSQL* con, SERVER_REF* server_ref, SERVICE* service,
{
if (server_ref->server->version_string[0] == 0)
{
mxs_mysql_set_server_version(con, server_ref->server);
mxs_mysql_update_server_version(con, server_ref->server);
}
char* query = get_users_query(server_ref->server->version_string,

2
server/modules/monitor/galeramon/galeramon.cc
View File

@ -132,7 +132,7 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
char* server_string;
/* get server version string */
mxs_mysql_set_server_version(monitored_server->con, monitored_server->server);
mxs_mysql_update_server_version(monitored_server->con, monitored_server->server);
server_string = monitored_server->server->version_string;
/* Check if the the Galera FSM shows this node is joined to the cluster */

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

@ -881,7 +881,7 @@ void MariaDBServer::update_server_version()
/* Get server version string, also get/set numeric representation. This function does not query the
* server, since the data was obtained when connecting. */
mxs_mysql_set_server_version(conn, srv);
mxs_mysql_update_server_version(conn, srv);
// Check whether this server is a MaxScale Binlog Server.
MYSQL_RES* result;

2
server/modules/monitor/mmmon/mmmon.cc
View File

@ -90,7 +90,7 @@ void MMMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
server_version = mysql_get_server_version(monitored_server->con);
/* get server version string */
mxs_mysql_set_server_version(monitored_server->con, monitored_server->server);
mxs_mysql_update_server_version(monitored_server->con, monitored_server->server);
server_string = monitored_server->server->version_string;
/* get server_id form current node */

2
server/modules/monitor/ndbclustermon/ndbclustermon.cc
View File

@ -51,7 +51,7 @@ void NDBCMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
char* server_string;
/* get server version string */
mxs_mysql_set_server_version(monitored_server->con, monitored_server->server);
mxs_mysql_update_server_version(monitored_server->con, monitored_server->server);
server_string = monitored_server->server->version_string;
/* Check if the the SQL node is able to contact one or more data nodes */