Fix for bug #7213: information_schema: redundant non-standard TABLE_NAMES table

1 files changed, 19 insertions, 17 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 5a135faf52f..1b1b2131ecc 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1976,6 +1976,8 @@ int schema_tables_add(THD *thd, List<char> *files, const char *wild)
   ST_SCHEMA_TABLE *tmp_schema_table= schema_tables;
   for ( ; tmp_schema_table->table_name; tmp_schema_table++)
   {
+    if (tmp_schema_table->hidden)
+      continue;
     if (wild)
     {
       if (lower_case_table_names)
@@ -3688,38 +3690,38 @@ ST_FIELD_INFO table_names_fields_info[]=
 ST_SCHEMA_TABLE schema_tables[]=
 {
   {"SCHEMATA", schema_fields_info, create_schema_table,
-   fill_schema_shemata, make_schemata_old_format, 0, 1, -1},
+   fill_schema_shemata, make_schemata_old_format, 0, 1, -1, 0},
   {"TABLES", tables_fields_info, create_schema_table, 
-   get_all_tables, make_old_format, get_schema_tables_record, 1, 2},
+   get_all_tables, make_old_format, get_schema_tables_record, 1, 2, 0},
   {"COLUMNS", columns_fields_info, create_schema_table, 
-   get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2},
+   get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0},
   {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
-   fill_schema_charsets, make_character_sets_old_format, 0, -1, -1},
+   fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
   {"COLLATIONS", collation_fields_info, create_schema_table, 
-   fill_schema_collation, make_old_format, 0, -1, -1},
+   fill_schema_collation, make_old_format, 0, -1, -1, 0},
   {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
-   create_schema_table, fill_schema_coll_charset_app, 0, 0, -1, -1},
+   create_schema_table, fill_schema_coll_charset_app, 0, 0, -1, -1, 0},
   {"ROUTINES", proc_fields_info, create_schema_table, 
-    fill_schema_proc, make_proc_old_format, 0, -1, -1},
+    fill_schema_proc, make_proc_old_format, 0, -1, -1, 0},
   {"STATISTICS", stat_fields_info, create_schema_table, 
-    get_all_tables, make_old_format, get_schema_stat_record, 1, 2},
+    get_all_tables, make_old_format, get_schema_stat_record, 1, 2, 0},
   {"VIEWS", view_fields_info, create_schema_table, 
-    get_all_tables, 0, get_schema_views_record, 1, 2},
+    get_all_tables, 0, get_schema_views_record, 1, 2, 0},
   {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 
-    fill_schema_user_privileges, 0, 0, -1, -1},
+    fill_schema_user_privileges, 0, 0, -1, -1, 0},
   {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table,
-    fill_schema_schema_privileges, 0, 0, -1, -1},
+    fill_schema_schema_privileges, 0, 0, -1, -1, 0},
   {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
-    fill_schema_table_privileges, 0, 0, -1, -1},
+    fill_schema_table_privileges, 0, 0, -1, -1, 0},
   {"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
-    fill_schema_column_privileges, 0, 0, -1, -1},
+    fill_schema_column_privileges, 0, 0, -1, -1, 0},
   {"TABLE_CONSTRAINTS", table_constraints_fields_info, create_schema_table,
-    get_all_tables, 0, get_schema_constraints_record, 3, 4},
+    get_all_tables, 0, get_schema_constraints_record, 3, 4, 0},
   {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
-    get_all_tables, 0, get_schema_key_column_usage_record, 4, 5},
+    get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
   {"TABLE_NAMES", table_names_fields_info, create_schema_table,
-   get_all_tables, make_table_names_old_format, 0, 1, 2},
-  {0, 0, 0, 0, 0, 0, 0, 0}
+   get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
+  {0, 0, 0, 0, 0, 0, 0, 0, 0}
 };