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

MXS-1249: Modifications after rebase on develop

Browse Source
This commit is contained in:
Johan Wikman
2017-06-19 14:04:10 +03:00
parent 1034cc51be
commit 4e73aecdef
7 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/mysql_utils.cc
View File

@ -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;
}

18
server/core/server.cc
View File

@ -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;
}
/**