diff options
| author | Jan Lindström <jan.lindstrom@galeracluster.com> | 2023-04-20 13:26:09 +0300 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2023-05-16 13:11:44 +0200 |
| commit | 956d6c4af9e353299cce6d2ccbd7c400a1d00d70 (patch) | |
| tree | 7093f432715d550778c5633ae5fc3b64e72f9aaa /sql/table.cc | |
| parent | ffd5d74c4f0e0812b461b5c6990abdf99ed038bf (diff) | |
| download | mariadb-git-10.4.tar.gz | |
MDEV-21479 : Galera 4 unable to query cluster state if not primary componentbb-10.4-MDEV-31067-aggregate-condbb-10.4-MDEV-30013-galera10.4
Set mysql.wsrep_cluster and mysql.wsrep_cluster_members as
TABLE_CATEGORY_INFORMATION as mysql.wsrep_streaming_log
so that they can be queried even if node is not primary
component.
Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 0f296a85e58..44d639e27a4 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -45,6 +45,9 @@ #include "ha_sequence.h" #include "sql_show.h" #include "opt_trace.h" +#ifdef WITH_WSREP +#include "wsrep_schema.h" +#endif /* For MySQL 5.7 virtual fields */ #define MYSQL57_GENERATED_FIELD 128 @@ -264,10 +267,14 @@ TABLE_CATEGORY get_table_category(const LEX_CSTRING *db, DBUG_ASSERT(name != NULL); #ifdef WITH_WSREP - if (my_strcasecmp(system_charset_info, db->str, "mysql") == 0 && - my_strcasecmp(system_charset_info, name->str, "wsrep_streaming_log") == 0) + if (my_strcasecmp(system_charset_info, db->str, WSREP_SCHEMA) == 0) { - return TABLE_CATEGORY_INFORMATION; + if ((my_strcasecmp(system_charset_info, name->str, WSREP_STREAMING_TABLE) == 0 || + my_strcasecmp(system_charset_info, name->str, WSREP_CLUSTER_TABLE) == 0 || + my_strcasecmp(system_charset_info, name->str, WSREP_MEMBERS_TABLE) == 0)) + { + return TABLE_CATEGORY_INFORMATION; + } } #endif /* WITH_WSREP */ if (is_infoschema_db(db)) |