Merge branch '2.1' into 2.2

2018-04-10 15:27:20 +03:00
parent d22be5dd3e f94d1a9863
commit d28cf6b948
1 changed files with 0 additions and 4 deletions
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@ -333,10 +333,6 @@ int MySQLSendHandshake(DCB* dcb)
    mysql_server_capabilities_one[0] = (uint8_t)GW_MYSQL_CAPABILITIES_SERVER;
    mysql_server_capabilities_one[1] = (uint8_t)(GW_MYSQL_CAPABILITIES_SERVER >> 8);

-    // Check that we match the old values
-    ss_dassert(mysql_server_capabilities_one[0] == 0xff);
-    ss_dassert(mysql_server_capabilities_one[1] == 0xf7);
-
    if (is_maria)
    {
        /** A MariaDB 10.2 server doesn't send the CLIENT_MYSQL capability