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

22
server/core/mysql_utils.cc
View File

@ -407,25 +407,13 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char* pcre,
return rv;
}
void mxs_mysql_set_server_version(MYSQL* mysql, SERVER* server)
void mxs_mysql_update_server_version(MYSQL* mysql, SERVER* server)
{
// This function should only be called for a live connection.
const char* version_string = mysql_get_server_info(mysql);
if (version_string)
{
unsigned long version = mysql_get_server_version(mysql);
server_set_version(server, version_string, version);
if (strcasestr(version_string, "mariadb") != NULL)
{
server->server_type = SERVER_TYPE_MARIADB;
}
else
{
server->server_type = SERVER_TYPE_MYSQL;
}
}
unsigned long version_num = mysql_get_server_version(mysql);
mxb_assert(version_string != NULL && version_num != 0);
server_set_version(server, version_string, version_num);
}
void mxs_mysql_set_log_statements(bool enable)