From de76e99924af04674a7cb85582195977772cd7bf Mon Sep 17 00:00:00 2001 From: Akshat Nehra Date: Thu, 7 Aug 2025 21:43:44 -0700 Subject: [PATCH] MDEV-33910 Mark mysql and performance_schema tables as SYSTEM TABLE/VIEW Tables in the mysql and performance_schema databases were incorrectly shown as "BASE TABLE" and "VIEW" in INFORMATION_SCHEMA.TABLES. These should be marked as "SYSTEM TABLE" and "SYSTEM VIEW" respectively. This commit modifies the get_schema_tables_record() function in sql_show.cc to correctly identify tables belonging to mysql and performance_schema schemas and set their TABLE_TYPE accordingly. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc. --- .../suite/funcs_1/r/is_tables_mysql.result | 60 +++---- .../funcs_1/r/is_tables_mysql_embedded.result | 120 ++++++------- .../perfschema/r/information_schema.result | 160 +++++++++--------- sql/sql_show.cc | 14 +- 4 files changed, 182 insertions(+), 172 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result index f818722644999..6d678abcefda5 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result @@ -13,7 +13,7 @@ ORDER BY table_schema,table_name; TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME columns_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -38,7 +38,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME column_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -63,7 +63,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME db -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -88,7 +88,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME event -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -113,7 +113,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME func -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -138,7 +138,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME general_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -163,7 +163,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME global_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -188,7 +188,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME gtid_slave_pos -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -213,7 +213,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_category -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -238,7 +238,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_keyword -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -263,7 +263,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_relation -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -288,7 +288,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_topic -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -313,7 +313,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -338,7 +338,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -363,7 +363,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -388,7 +388,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME plugin -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -413,7 +413,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proc -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -438,7 +438,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME procs_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -463,7 +463,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proxies_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -488,7 +488,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME roles_mapping -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -513,7 +513,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME servers -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -538,7 +538,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME slow_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -563,7 +563,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME tables_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -588,7 +588,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -613,7 +613,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -638,7 +638,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_leap_second -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -663,7 +663,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_name -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -688,7 +688,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -713,7 +713,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition_type -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -738,7 +738,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME transaction_registry -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result index 80f5edcf9e282..8673aa641d8e4 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result @@ -13,7 +13,7 @@ ORDER BY table_schema,table_name; TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME columns_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -38,7 +38,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME column_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -63,7 +63,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME db -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -88,7 +88,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME event -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -113,7 +113,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME func -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -138,7 +138,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME general_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -163,7 +163,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME global_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -188,7 +188,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME gtid_slave_pos -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -213,7 +213,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_category -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -238,7 +238,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_keyword -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -263,7 +263,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_relation -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -288,7 +288,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_topic -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -313,7 +313,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -338,7 +338,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -363,7 +363,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -388,7 +388,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME plugin -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -413,7 +413,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proc -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -438,7 +438,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME procs_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -463,7 +463,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proxies_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -488,7 +488,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME roles_mapping -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -513,7 +513,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME servers -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -538,7 +538,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME slow_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -563,7 +563,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME tables_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -588,7 +588,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -613,7 +613,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -638,7 +638,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_leap_second -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -663,7 +663,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_name -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -688,7 +688,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -713,7 +713,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition_type -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -738,7 +738,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME transaction_registry -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -802,7 +802,7 @@ ORDER BY table_schema,table_name; TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME columns_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -827,7 +827,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME column_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -852,7 +852,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME db -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -877,7 +877,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME event -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -902,7 +902,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME func -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -927,7 +927,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME general_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -952,7 +952,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME global_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -977,7 +977,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME gtid_slave_pos -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1002,7 +1002,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_category -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1027,7 +1027,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_keyword -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1052,7 +1052,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_relation -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1077,7 +1077,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME help_topic -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1102,7 +1102,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1127,7 +1127,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_index_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1152,7 +1152,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME innodb_table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1177,7 +1177,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME plugin -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1202,7 +1202,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proc -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1227,7 +1227,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME procs_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1252,7 +1252,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME proxies_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1277,7 +1277,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME roles_mapping -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1302,7 +1302,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME servers -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 11 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1327,7 +1327,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME slow_log -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE CSV VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1352,7 +1352,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME tables_priv -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1377,7 +1377,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME table_stats -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1402,7 +1402,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1427,7 +1427,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_leap_second -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1452,7 +1452,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_name -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1477,7 +1477,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1502,7 +1502,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME time_zone_transition_type -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE MYISAM_OR_MARIA VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE @@ -1527,7 +1527,7 @@ Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql TABLE_NAME transaction_registry -TABLE_TYPE BASE TABLE +TABLE_TYPE SYSTEM TABLE ENGINE InnoDB VERSION 10 ROW_FORMAT DYNAMIC_OR_PAGE diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result index fa0f5a6a484b1..2353a4d86095a 100644 --- a/mysql-test/suite/perfschema/r/information_schema.result +++ b/mysql-test/suite/perfschema/r/information_schema.result @@ -88,86 +88,86 @@ from information_schema.tables where TABLE_SCHEMA='performance_schema' order by table_name; lower(TABLE_NAME) TABLE_TYPE ENGINE -accounts BASE TABLE PERFORMANCE_SCHEMA -cond_instances BASE TABLE PERFORMANCE_SCHEMA -events_stages_current BASE TABLE PERFORMANCE_SCHEMA -events_stages_history BASE TABLE PERFORMANCE_SCHEMA -events_stages_history_long BASE TABLE PERFORMANCE_SCHEMA -events_stages_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_stages_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_stages_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_stages_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_stages_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_statements_current BASE TABLE PERFORMANCE_SCHEMA -events_statements_history BASE TABLE PERFORMANCE_SCHEMA -events_statements_history_long BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_digest BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_program BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_statements_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_transactions_current BASE TABLE PERFORMANCE_SCHEMA -events_transactions_history BASE TABLE PERFORMANCE_SCHEMA -events_transactions_history_long BASE TABLE PERFORMANCE_SCHEMA -events_transactions_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_transactions_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_transactions_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_transactions_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_transactions_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_waits_current BASE TABLE PERFORMANCE_SCHEMA -events_waits_history BASE TABLE PERFORMANCE_SCHEMA -events_waits_history_long BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA -events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA -file_instances BASE TABLE PERFORMANCE_SCHEMA -file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA -file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA -global_status BASE TABLE PERFORMANCE_SCHEMA -hosts BASE TABLE PERFORMANCE_SCHEMA -host_cache BASE TABLE PERFORMANCE_SCHEMA -memory_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA -memory_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA -memory_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA -memory_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA -memory_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA -metadata_locks BASE TABLE PERFORMANCE_SCHEMA -mutex_instances BASE TABLE PERFORMANCE_SCHEMA -objects_summary_global_by_type BASE TABLE PERFORMANCE_SCHEMA -performance_timers BASE TABLE PERFORMANCE_SCHEMA -prepared_statements_instances BASE TABLE PERFORMANCE_SCHEMA -replication_applier_configuration BASE TABLE PERFORMANCE_SCHEMA -replication_applier_status BASE TABLE PERFORMANCE_SCHEMA -replication_applier_status_by_coordinator BASE TABLE PERFORMANCE_SCHEMA -replication_applier_status_by_worker BASE TABLE PERFORMANCE_SCHEMA -replication_connection_configuration BASE TABLE PERFORMANCE_SCHEMA -rwlock_instances BASE TABLE PERFORMANCE_SCHEMA -session_account_connect_attrs BASE TABLE PERFORMANCE_SCHEMA -session_connect_attrs BASE TABLE PERFORMANCE_SCHEMA -session_status BASE TABLE PERFORMANCE_SCHEMA -setup_actors BASE TABLE PERFORMANCE_SCHEMA -setup_consumers BASE TABLE PERFORMANCE_SCHEMA -setup_instruments BASE TABLE PERFORMANCE_SCHEMA -setup_objects BASE TABLE PERFORMANCE_SCHEMA -socket_instances BASE TABLE PERFORMANCE_SCHEMA -socket_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA -socket_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA -status_by_account BASE TABLE PERFORMANCE_SCHEMA -status_by_host BASE TABLE PERFORMANCE_SCHEMA -status_by_thread BASE TABLE PERFORMANCE_SCHEMA -status_by_user BASE TABLE PERFORMANCE_SCHEMA -table_handles BASE TABLE PERFORMANCE_SCHEMA -table_io_waits_summary_by_index_usage BASE TABLE PERFORMANCE_SCHEMA -table_io_waits_summary_by_table BASE TABLE PERFORMANCE_SCHEMA -table_lock_waits_summary_by_table BASE TABLE PERFORMANCE_SCHEMA -threads BASE TABLE PERFORMANCE_SCHEMA -users BASE TABLE PERFORMANCE_SCHEMA -user_variables_by_thread BASE TABLE PERFORMANCE_SCHEMA +accounts SYSTEM TABLE PERFORMANCE_SCHEMA +cond_instances SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_current SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_history SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_history_long SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_summary_by_account_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_summary_by_host_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_summary_by_thread_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_summary_by_user_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_stages_summary_global_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_current SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_history SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_history_long SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_account_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_digest SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_host_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_program SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_thread_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_by_user_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_statements_summary_global_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_current SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_history SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_history_long SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_summary_by_account_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_summary_by_host_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_summary_by_thread_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_summary_by_user_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_transactions_summary_global_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_current SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_history SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_history_long SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_account_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_host_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_instance SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_thread_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_by_user_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +events_waits_summary_global_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +file_instances SYSTEM TABLE PERFORMANCE_SCHEMA +file_summary_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +file_summary_by_instance SYSTEM TABLE PERFORMANCE_SCHEMA +global_status SYSTEM TABLE PERFORMANCE_SCHEMA +hosts SYSTEM TABLE PERFORMANCE_SCHEMA +host_cache SYSTEM TABLE PERFORMANCE_SCHEMA +memory_summary_by_account_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +memory_summary_by_host_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +memory_summary_by_thread_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +memory_summary_by_user_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +memory_summary_global_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +metadata_locks SYSTEM TABLE PERFORMANCE_SCHEMA +mutex_instances SYSTEM TABLE PERFORMANCE_SCHEMA +objects_summary_global_by_type SYSTEM TABLE PERFORMANCE_SCHEMA +performance_timers SYSTEM TABLE PERFORMANCE_SCHEMA +prepared_statements_instances SYSTEM TABLE PERFORMANCE_SCHEMA +replication_applier_configuration SYSTEM TABLE PERFORMANCE_SCHEMA +replication_applier_status SYSTEM TABLE PERFORMANCE_SCHEMA +replication_applier_status_by_coordinator SYSTEM TABLE PERFORMANCE_SCHEMA +replication_applier_status_by_worker SYSTEM TABLE PERFORMANCE_SCHEMA +replication_connection_configuration SYSTEM TABLE PERFORMANCE_SCHEMA +rwlock_instances SYSTEM TABLE PERFORMANCE_SCHEMA +session_account_connect_attrs SYSTEM TABLE PERFORMANCE_SCHEMA +session_connect_attrs SYSTEM TABLE PERFORMANCE_SCHEMA +session_status SYSTEM TABLE PERFORMANCE_SCHEMA +setup_actors SYSTEM TABLE PERFORMANCE_SCHEMA +setup_consumers SYSTEM TABLE PERFORMANCE_SCHEMA +setup_instruments SYSTEM TABLE PERFORMANCE_SCHEMA +setup_objects SYSTEM TABLE PERFORMANCE_SCHEMA +socket_instances SYSTEM TABLE PERFORMANCE_SCHEMA +socket_summary_by_event_name SYSTEM TABLE PERFORMANCE_SCHEMA +socket_summary_by_instance SYSTEM TABLE PERFORMANCE_SCHEMA +status_by_account SYSTEM TABLE PERFORMANCE_SCHEMA +status_by_host SYSTEM TABLE PERFORMANCE_SCHEMA +status_by_thread SYSTEM TABLE PERFORMANCE_SCHEMA +status_by_user SYSTEM TABLE PERFORMANCE_SCHEMA +table_handles SYSTEM TABLE PERFORMANCE_SCHEMA +table_io_waits_summary_by_index_usage SYSTEM TABLE PERFORMANCE_SCHEMA +table_io_waits_summary_by_table SYSTEM TABLE PERFORMANCE_SCHEMA +table_lock_waits_summary_by_table SYSTEM TABLE PERFORMANCE_SCHEMA +threads SYSTEM TABLE PERFORMANCE_SCHEMA +users SYSTEM TABLE PERFORMANCE_SCHEMA +user_variables_by_thread SYSTEM TABLE PERFORMANCE_SCHEMA select lower(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables where TABLE_SCHEMA='performance_schema' diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 6636c44b60892..0ce372c7fc7bb 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5893,8 +5893,16 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, if (tables->view) { - table->field[3]->store(STRING_WITH_LEN("VIEW"), cs); - table->field[20]->store(STRING_WITH_LEN("VIEW"), cs); + if ((!strcmp(db_name->str, "mysql") && strcmp(table_name->str, "user")) || (!strcmp(db_name->str, "performance_schema"))) + { + table->field[3]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs); + table->field[20]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs); + } + else + { + table->field[3]->store(STRING_WITH_LEN("VIEW"), cs); + table->field[20]->store(STRING_WITH_LEN("VIEW"), cs); + } } else { @@ -5921,6 +5929,8 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, DBUG_ASSERT(share->tmp_table == NO_TMP_TABLE); if (share->versioned) table->field[3]->store(STRING_WITH_LEN("SYSTEM VERSIONED"), cs); + else if ((!strcmp(db_name->str, "mysql") && strcmp(table_name->str, "user")) || (!strcmp(db_name->str, "performance_schema"))) + table->field[3]->store(STRING_WITH_LEN("SYSTEM TABLE"), cs); else table->field[3]->store(STRING_WITH_LEN("BASE TABLE"), cs); }