From 6206abde3ef9bf725179cea9e78d513c3ba172a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 27 Dec 2018 14:42:22 +0200 Subject: [PATCH] Update Server version in server_set_version The new method was not called by the old function. --- server/core/server.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/core/server.cc b/server/core/server.cc index c7386bf65..29a810f74 100644 --- a/server/core/server.cc +++ b/server/core/server.cc @@ -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.: * 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(srv); server_set_version_string(server, version_string); atomic_store_uint64(&server->version, version); bool is_mariadb = (strcasestr(version_string, "mariadb") != NULL); 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)