From ed7a7ce1536d70e33f4788f791fbc77ba2246592 Mon Sep 17 00:00:00 2001 From: Pekka Lampio Date: Fri, 2 May 2025 11:41:40 +0300 Subject: [PATCH] MDEV-36711 Galera Cluster node reports wrong error code in detached state Bug fix for a Galera Cluster bug: When a Galera Cluster node is detached from the cluster it may report wrong error code for an executed query. This caused the MTR test galera.MDEV-35946 for MDEV-35946. --- sql/table.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sql/table.cc b/sql/table.cc index a708b68bace0e..5b0acca0c5afb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -303,6 +303,20 @@ TABLE_CATEGORY get_table_category(const Lex_ident_db &db, if (is_perfschema_db(&db)) return TABLE_CATEGORY_PERFORMANCE; +#ifdef WITH_WSREP + if (db.streq(WSREP_LEX_SCHEMA)) + { + if(name.streq(WSREP_LEX_STREAMING)) + return TABLE_CATEGORY_INFORMATION; + if (name.streq(WSREP_LEX_CLUSTER)) + return TABLE_CATEGORY_INFORMATION; + if (name.streq(WSREP_LEX_MEMBERS)) + return TABLE_CATEGORY_INFORMATION; + if (name.streq(WSREP_LEX_ALLOWLIST)) + return TABLE_CATEGORY_INFORMATION; + } +#endif /* WITH_WSREP */ + if (db.streq(MYSQL_SCHEMA_NAME)) { if (is_system_table_name(name)) @@ -319,20 +333,6 @@ TABLE_CATEGORY get_table_category(const Lex_ident_db &db, return TABLE_CATEGORY_MYSQL; } -#ifdef WITH_WSREP - if (db.streq(WSREP_LEX_SCHEMA)) - { - if(name.streq(WSREP_LEX_STREAMING)) - return TABLE_CATEGORY_INFORMATION; - if (name.streq(WSREP_LEX_CLUSTER)) - return TABLE_CATEGORY_INFORMATION; - if (name.streq(WSREP_LEX_MEMBERS)) - return TABLE_CATEGORY_INFORMATION; - if (name.streq(WSREP_LEX_ALLOWLIST)) - return TABLE_CATEGORY_INFORMATION; - } -#endif /* WITH_WSREP */ - return TABLE_CATEGORY_USER; }