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

MXS-1249: Also use mxs_mysql_set_version in mmon.c

Browse Source
This commit is contained in:
Johan Wikman
2017-06-19 10:49:55 +03:00
parent b8702b8d95
commit 2a848a63c8
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/mmmon/mmmon.c
View File

@ -20,6 +20,7 @@
#include "mmmon.h" #include "mmmon.h"
#include <maxscale/dcb.h> #include <maxscale/dcb.h>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/mysql_utils.h>
static void monitorMain(void *); static void monitorMain(void *);
@ -261,11 +262,8 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
server_version = mysql_get_server_version(database->con); server_version = mysql_get_server_version(database->con);
/* get server version string */ /* get server version string */
server_string = (char *) mysql_get_server_info(database->con); mxs_mysql_set_server_version(database->con, database->server);
if (server_string) server_string = database->server->server_string;
{
server_set_version_string(database->server, server_string);
}
/* get server_id form current node */ /* get server_id form current node */
if (mysql_query(database->con, "SELECT @@server_id") == 0 if (mysql_query(database->con, "SELECT @@server_id") == 0