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

MXS-3297: Don't advertise unsupported capabilities

Browse Source 
Only bulk execute is supported. Supporting progress reporting currently
breaks the protocol result processing code.
This commit is contained in:
Markus Mäkelä
2020-11-17 10:43:40 +02:00
parent 4545b8f798
commit f577d09829
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/maxscale/protocol/mysql.h
View File

@ -272,6 +272,9 @@ typedef enum
#define MXS_MARIA_CAP_COM_MULTI (1 << 1)
#define MXS_MARIA_CAP_STMT_BULK_OPERATIONS (1 << 2)
// Only bulk operations are supported
#define MXS_MARIADB_CAP_SERVER MXS_MARIA_CAP_STMT_BULK_OPERATIONS
typedef enum
{
MXS_COM_SLEEP = 0,

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

@ -661,7 +661,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)