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

Merge branch '2.4' into 2.4.14

Browse Source
This commit is contained in:
Johan Wikman
2020-11-19 13:54:11 +02:00
parent 56575882d7 5fc73646a4
commit 5906f59344
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -693,7 +693,8 @@ static void store_client_information(DCB* dcb, GWBUF* buffer)
* there are extra capabilities stored in the last 4 bytes of the 23 byte filler. */
if ((proto->client_capabilities & GW_MYSQL_CAPABILITIES_CLIENT_MYSQL) == 0)
{
proto->extra_capabilities = gw_mysql_get_byte4(data + MARIADB_CAP_OFFSET);
uint32_t caps = gw_mysql_get_byte4(data + MARIADB_CAP_OFFSET);
proto->extra_capabilities = caps & MXS_MARIADB_CAP_SERVER;
}
if (len > MYSQL_AUTH_PACKET_BASE_SIZE)