From 60b88c90e0326d013d2ea6c133c4516cda8f3168 Mon Sep 17 00:00:00 2001 From: zipg Date: Wed, 15 Jul 2026 19:32:29 +0800 Subject: [PATCH] fix(cnch): support mysql protocol initialization --- crates/dbx-core/src/db/mysql.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs index 0af7a0c44..4e030a4f4 100644 --- a/crates/dbx-core/src/db/mysql.rs +++ b/crates/dbx-core/src/db/mysql.rs @@ -693,7 +693,9 @@ fn mysql_group_concat_setup_fallback_mode(setup_mode: MySqlSetupMode, error: &st } let lower = error.to_ascii_lowercase(); - if lower.contains("group_concat_max_len") && (lower.contains("1193") || lower.contains("unknown system variable")) { + let setup_query_rejected = + lower.contains("1193") || lower.contains("unknown system variable") || lower.contains("syntax error"); + if lower.contains("group_concat_max_len") && setup_query_rejected { return Some(MySqlSetupMode::Compatible); } @@ -4536,6 +4538,16 @@ UNIQUE KEY(`tenant_id`, `name``part`) ); } + #[test] + fn mysql_cnch_group_concat_syntax_error_retries_without_session_variable() { + let error = "MySQL connection failed: Server error: `ERROR HY000 (1105): unknown error: Error 62 (HY000): Code: 62, e.displayText() = DB::Exception: host = cnch-server-2: Syntax error: failed at position 13 ('group_concat_max_len'): group_concat_max_len = 1048576. Expected one of: Dot, token, Equals SQLSTATE: 42000 (version 21.8.7.1)'"; + + assert_eq!( + mysql_group_concat_setup_fallback_mode(MySqlSetupMode::Standard, error), + Some(MySqlSetupMode::Compatible) + ); + } + #[test] fn mysql_proxy_parse_tablename_1105_does_not_disable_group_concat() { let error = "MySQL connection failed: Server error: `ERROR 07000 (1105): SQL操作失败 (operate fail ) ：解析表名出错 ( parse tablename error ) '";