Merge branch '2.2' into develop

2018-06-18 11:39:10 +03:00
parent 0f187807c1 ca155fbfe9
commit df24f09ce5
2 changed files with 3 additions and 3 deletions
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@ -231,7 +231,7 @@ int MySQLSendHandshake(DCB* dcb)
    {
        mysql_server_language = dcb->service->dbref->server->charset;

-        if (strstr(dcb->service->dbref->server->version_string, "10.2."))
+        if (dcb->service->dbref->server->version >= 100200)
        {
            /** The backend servers support the extended capabilities */
            is_maria = true;