From 4ce11e0cf07c0f60989bcf858d2e02aeacfc3636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Fri, 24 Jan 2025 12:59:03 +0100 Subject: [PATCH 1/2] server: set CLIENT_CONNECT_ATTRS --- server/server_conf.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/server_conf.go b/server/server_conf.go index bff1967c9..4db71c6aa 100644 --- a/server/server_conf.go +++ b/server/server_conf.go @@ -51,7 +51,8 @@ func NewDefaultServer() *Server { serverVersion: "8.0.11", protocolVersion: 10, capability: CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_CONNECT_WITH_DB | CLIENT_PROTOCOL_41 | - CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH | CLIENT_SSL | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA, + CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH | CLIENT_SSL | + CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS, collationId: DEFAULT_COLLATION_ID, defaultAuthMethod: AUTH_NATIVE_PASSWORD, pubKey: getPublicKeyFromCert(certPem), From d481ca2811853a9ba995d873e53959a0f86a166e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Fri, 24 Jan 2025 13:19:58 +0100 Subject: [PATCH 2/2] update comment/docs --- server/conn.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/conn.go b/server/conn.go index 7fc80727c..b3987ff88 100644 --- a/server/conn.go +++ b/server/conn.go @@ -156,6 +156,8 @@ func (c *Conn) Charset() uint8 { return c.charset } +// Attributes returns the connection attributes. +// Note that this is only sent to the server if CLIENT_CONNECT_ATTRS is set. func (c *Conn) Attributes() map[string]string { return c.attributes }