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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-10-31 08:53:50 +02:00
parent ce35b0d541 47e7595a08
commit 7deed35587
12 changed files with 73 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -203,22 +203,33 @@ static char* gw_default_auth()
std::string get_version_string(SERVICE* service)
{
std::string rval;
uint64_t intver = UINT64_MAX;
std::string rval = DEFAULT_VERSION_STRING;
for (SERVER_REF* ref = service->dbref; ref; ref = ref->next)
if (service->version_string[0])
{
if (ref->server->version && ref->server->version < intver)
// User-defined version string, use it
rval = service->version_string;
}
else
{
uint64_t intver = UINT64_MAX;
for (SERVER_REF* ref = service->dbref; ref; ref = ref->next)
{
rval = ref->server->version_string;
intver = ref->server->version;
if (ref->server->version && ref->server->version < intver)
{
rval = ref->server->version_string;
intver = ref->server->version;
}
}
}
// Get the version string from service if no server version is available
if (rval.empty())
// Older applications don't understand versions other than 5 and cause strange problems
const char prefix[] = "5.5.5-";
if (strncmp(rval.c_str(), prefix, sizeof(prefix) - 1) != 0)
{
rval = service->version_string;
rval = prefix + rval;
}
return rval;