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

Remove unused and confusing variable

Browse Source 
The global version_string variable was never set.
This commit is contained in:
Markus Mäkelä
2018-10-31 09:13:07 +02:00
parent 7deed35587
commit 06d1189e94
3 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/service.cc
View File

@ -135,17 +135,9 @@ Service* service_alloc(const char* name, const char* router, MXS_CONFIG_PARAMETE
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())
{
if (config_get_global_options()->version_string)
{
version_string = config_get_global_options()->version_string;
}
}
else if (version_string[0] != '5')
if (!version_string.empty() && version_string[0] != '5')
{
/**
* Add the 5.5.5- string to the start of the version string if the version