From 0777de348bf8c4ffece4321c397c6024ab72280c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 3 Aug 2018 13:57:39 +0300 Subject: [PATCH] MXS-1929: Fix handling of version_string The parameter was set to 5.5.5- if it wasn't defined. --- server/core/service.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/core/service.cc b/server/core/service.cc index 98995b053..74dbea19d 100644 --- a/server/core/service.cc +++ b/server/core/service.cc @@ -136,9 +136,12 @@ static std::string get_version_string(MXS_CONFIG_PARAMETER* params) std::string version_string = config_get_string(params, CN_VERSION_STRING); - if (version_string.empty() && config_get_global_options()->version_string) + if (version_string.empty()) { - version_string = config_get_global_options()->version_string; + if (config_get_global_options()->version_string) + { + version_string = config_get_global_options()->version_string; + } } else if (version_string[0] != '5') { @@ -1813,12 +1816,12 @@ bool Service::dump_config(const char *filename) const if (!m_version_string.empty()) { - dprintf(file, "%s=%s\n", CN_VERSION_STRING, version_string); + dprintf(file, "%s=%s\n", CN_VERSION_STRING, m_version_string.c_str()); } if (!m_weightby.empty()) { - dprintf(file, "%s=%s\n", CN_WEIGHTBY, weightby); + dprintf(file, "%s=%s\n", CN_WEIGHTBY, m_weightby.c_str()); } if (dbref)