From 2a848a63c87d6b342d333b203dd33a5275125e79 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 19 Jun 2017 10:49:55 +0300 Subject: [PATCH] MXS-1249: Also use mxs_mysql_set_version in mmon.c --- server/modules/monitor/mmmon/mmmon.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/modules/monitor/mmmon/mmmon.c b/server/modules/monitor/mmmon/mmmon.c index 3253e164e..cf18dd0f6 100644 --- a/server/modules/monitor/mmmon/mmmon.c +++ b/server/modules/monitor/mmmon/mmmon.c @@ -20,6 +20,7 @@ #include "mmmon.h" #include #include +#include static void monitorMain(void *); @@ -261,11 +262,8 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database) server_version = mysql_get_server_version(database->con); /* get server version string */ - server_string = (char *) mysql_get_server_info(database->con); - if (server_string) - { - server_set_version_string(database->server, server_string); - } + mxs_mysql_set_server_version(database->con, database->server); + server_string = database->server->server_string; /* get server_id form current node */ if (mysql_query(database->con, "SELECT @@server_id") == 0