From 4e73aecdef8389e1068a1afd40bf9bd35dd16337 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 19 Jun 2017 14:04:10 +0300 Subject: [PATCH] MXS-1249: Modifications after rebase on develop --- include/maxscale/mysql_utils.h | 4 +--- server/core/mysql_utils.cc | 8 ++------ server/core/server.cc | 18 +++++------------- server/modules/monitor/galeramon/galeramon.c | 2 +- server/modules/monitor/mmmon/mmmon.c | 2 +- server/modules/monitor/mysqlmon/mysql_mon.c | 2 +- .../monitor/ndbclustermon/ndbclustermon.c | 2 +- 7 files changed, 12 insertions(+), 26 deletions(-) diff --git a/include/maxscale/mysql_utils.h b/include/maxscale/mysql_utils.h index 222607c16..cc47c754c 100644 --- a/include/maxscale/mysql_utils.h +++ b/include/maxscale/mysql_utils.h @@ -88,9 +88,7 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char *pcre, * * @param mysql A MySQL handle to the server. * @param server The server whose version information should be updated. - * - * @return True, if the information could be set, false if an error occurred. */ -bool mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server); +void mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server); MXS_END_DECLS diff --git a/server/core/mysql_utils.cc b/server/core/mysql_utils.cc index 8fa7a6438..ce11aa827 100644 --- a/server/core/mysql_utils.cc +++ b/server/core/mysql_utils.cc @@ -286,10 +286,8 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char *pcre, return rv; } -bool mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server) +void mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server) { - bool rv = false; - const char* s = mysql_get_server_info(mysql); if (s) @@ -300,8 +298,6 @@ bool mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server) unsigned long minor = (v - major * 10000) / 100; unsigned long patch = v - major * 10000 - minor * 100; - rv = server_set_version(server, s, major, minor, patch); + server_set_version(server, s, major, minor, patch); } - - return rv; } diff --git a/server/core/server.cc b/server/core/server.cc index add92f645..52b39c9b1 100644 --- a/server/core/server.cc +++ b/server/core/server.cc @@ -1114,22 +1114,14 @@ void server_set_version_string(SERVER* server, const char* version) * @param major The major version. * @param minor The minor version. * @param patch The patch version. - * - * @return True if the assignment of the version string was successful, false if - * memory allocation failed. */ -bool server_set_version(SERVER* server, const char* string, uint32_t major, uint32_t minor, uint32_t patch) +void server_set_version(SERVER* server, const char* string, uint32_t major, uint32_t minor, uint32_t patch) { - bool rv = server_set_version_string(server, string); + server_set_version_string(server, string); - if (rv) - { - server->version.major = major; - server->version.minor = minor; - server->version.patch = patch; - } - - return rv; + server->version.major = major; + server->version.minor = minor; + server->version.patch = patch; } /** diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c index 11249efb5..6cbda4144 100644 --- a/server/modules/monitor/galeramon/galeramon.c +++ b/server/modules/monitor/galeramon/galeramon.c @@ -315,7 +315,7 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database) /* get server version string */ mxs_mysql_set_server_version(database->con, database->server); - server_string = database->server->server_string; + server_string = database->server->version_string; /* Check if the the Galera FSM shows this node is joined to the cluster */ char *cluster_member = "SHOW STATUS WHERE Variable_name IN" diff --git a/server/modules/monitor/mmmon/mmmon.c b/server/modules/monitor/mmmon/mmmon.c index cf18dd0f6..20448f759 100644 --- a/server/modules/monitor/mmmon/mmmon.c +++ b/server/modules/monitor/mmmon/mmmon.c @@ -263,7 +263,7 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database) /* get server version string */ mxs_mysql_set_server_version(database->con, database->server); - server_string = database->server->server_string; + server_string = database->server->version_string; /* get server_id form current node */ if (mysql_query(database->con, "SELECT @@server_id") == 0 diff --git a/server/modules/monitor/mysqlmon/mysql_mon.c b/server/modules/monitor/mysqlmon/mysql_mon.c index 657ccb3ba..4f1a8baaf 100644 --- a/server/modules/monitor/mysqlmon/mysql_mon.c +++ b/server/modules/monitor/mysqlmon/mysql_mon.c @@ -728,7 +728,7 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database) /* get server version string */ mxs_mysql_set_server_version(database->con, database->server); - server_string = database->server->server_string; + server_string = database->server->version_string; MYSQL_SERVER_INFO *serv_info = hashtable_fetch(handle->server_info, database->server->unique_name); ss_dassert(serv_info); diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.c b/server/modules/monitor/ndbclustermon/ndbclustermon.c index bbbe655ed..1bbd345fb 100644 --- a/server/modules/monitor/ndbclustermon/ndbclustermon.c +++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c @@ -226,7 +226,7 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP /* get server version string */ mxs_mysql_set_server_version(database->con, database->server); - server_string = database->server->server_string; + server_string = database->server->version_string; /* Check if the the SQL node is able to contact one or more data nodes */ if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'") == 0