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

Fix server version detection of 10.2 flags

Browse Source 
The code used the wrong version string. Instead of using the server
version string, it used the service version string.
This commit is contained in:
Markus Mäkelä
2017-02-20 15:32:11 +02:00
parent 644b139b00
commit 9aa22c6eb4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -232,21 +232,28 @@ int MySQLSendHandshake(DCB* dcb)
int len_version_string = 0;
int id_num;
bool is_maria = false;
if (dcb->service->dbref)
{
mysql_server_language = dcb->service->dbref->server->charset;
if (dcb->service->dbref->server->server_string &&
strstr(dcb->service->dbref->server->server_string, "10.2."))
{
/** The backend servers support the extended capabilities */
is_maria = true;
}
}
MySQLProtocol *protocol = DCB_PROTOCOL(dcb, MySQLProtocol);
GWBUF *buf;
bool is_maria = false;
/* get the version string from service property if available*/
if (dcb->service->version_string != NULL)
{
version_string = dcb->service->version_string;
len_version_string = strlen(version_string);
is_maria = strstr(version_string, "10.2.");
}
else
{