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

Update Server version in server_set_version

Browse Source 
The new method was not called by the old function.
This commit is contained in:
Markus Mäkelä
2018-12-27 14:42:22 +02:00
parent 1fa0144b0b
commit 6206abde3e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/server.cc
View File

@ -1041,12 +1041,14 @@ void Server::set_version(uint64_t version_num, const std::string& version_str)
* @param version Version encoded as MariaDB encodes the version, i.e.: * @param version Version encoded as MariaDB encodes the version, i.e.:
* version = major * 10000 + minor * 100 + patch * version = major * 10000 + minor * 100 + patch
*/ */
void server_set_version(SERVER* server, const char* version_string, uint64_t version) void server_set_version(SERVER* srv, const char* version_string, uint64_t version)
{ {
Server* server = static_cast<Server*>(srv);
server_set_version_string(server, version_string); server_set_version_string(server, version_string);
atomic_store_uint64(&server->version, version); atomic_store_uint64(&server->version, version);
bool is_mariadb = (strcasestr(version_string, "mariadb") != NULL); bool is_mariadb = (strcasestr(version_string, "mariadb") != NULL);
server->server_type = is_mariadb ? SERVER_TYPE_MARIADB : SERVER_TYPE_MYSQL; server->server_type = is_mariadb ? SERVER_TYPE_MARIADB : SERVER_TYPE_MYSQL;
server->set_version(version, version_string);
} }
uint64_t server_get_version(const SERVER* server) uint64_t server_get_version(const SERVER* server)