MDEV-36527 : Selecting mysql.wsrep_streaming_log incorrectly not allowed when detached

In the get_table_category function, the check for whether
a table is a WSREP system table was incorrectly placed.
As a result, TABLE_CATEGORY_MYSQL was returned, but user
access to tables in this category is not allowed when
the server is detached.

Fixed by moving the check for whether a table is a WSREP
system table inside the section with checks for MySQL
schema tables. Its category is now correctly set to
TABLE_CATEGORY_INFORMATION, and tables in this category
are accessible when detached.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>

Author: janlindstrom

sql/table.cc

@@ -316,12 +316,7 @@ TABLE_CATEGORY get_table_category(const Lex_ident_db &db,
         name.streq(TRANSACTION_REG_NAME))
       return TABLE_CATEGORY_LOG;
 
-    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))
@@ -330,9 +325,11 @@ TABLE_CATEGORY get_table_category(const Lex_ident_db &db,
       return TABLE_CATEGORY_INFORMATION;
     if (name.streq(WSREP_LEX_ALLOWLIST))
       return TABLE_CATEGORY_INFORMATION;
-  }
 #endif /* WITH_WSREP */
 
+    return TABLE_CATEGORY_MYSQL;
+  }
+
   return TABLE_CATEGORY_USER;
 }
 

sql/wsrep_schema.cc

@@ -43,7 +43,6 @@
 #define WSREP_MEMBERS_TABLE   "wsrep_cluster_members"
 #define WSREP_ALLOWLIST_TABLE "wsrep_allowlist"
 
-LEX_CSTRING WSREP_LEX_SCHEMA= {STRING_WITH_LEN(WSREP_SCHEMA)};
 LEX_CSTRING WSREP_LEX_STREAMING= {STRING_WITH_LEN(WSREP_STREAMING_TABLE)};
 LEX_CSTRING WSREP_LEX_CLUSTER= {STRING_WITH_LEN(WSREP_CLUSTER_TABLE)};
 LEX_CSTRING WSREP_LEX_MEMBERS= {STRING_WITH_LEN(WSREP_MEMBERS_TABLE)};

sql/wsrep_schema.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2024 Codership Oy <info@codership.com>
+/* Copyright (C) 2015-2025 Codership Oy <info@codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -172,7 +172,6 @@ class Wsrep_schema
 
 extern Wsrep_schema* wsrep_schema;
 
-extern LEX_CSTRING WSREP_LEX_SCHEMA;
 extern LEX_CSTRING WSREP_LEX_STREAMING;
 extern LEX_CSTRING WSREP_LEX_CLUSTER;
 extern LEX_CSTRING WSREP_LEX_MEMBERS;