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

mysql-test/r/information_schema.result

@@ -49,7 +49,6 @@ TABLE_PRIVILEGES
 COLUMN_PRIVILEGES
 TABLE_CONSTRAINTS
 KEY_COLUMN_USAGE
-TABLE_NAMES
 columns_priv
 db
 func
@@ -78,7 +77,6 @@ c	table_name
 TABLES	TABLES
 TABLE_PRIVILEGES	TABLE_PRIVILEGES
 TABLE_CONSTRAINTS	TABLE_CONSTRAINTS
-TABLE_NAMES	TABLE_NAMES
 tables_priv	tables_priv
 time_zone	time_zone
 time_zone_leap_second	time_zone_leap_second
@@ -96,7 +94,6 @@ c	table_name
 TABLES	TABLES
 TABLE_PRIVILEGES	TABLE_PRIVILEGES
 TABLE_CONSTRAINTS	TABLE_CONSTRAINTS
-TABLE_NAMES	TABLE_NAMES
 tables_priv	tables_priv
 time_zone	time_zone
 time_zone_leap_second	time_zone_leap_second
@@ -577,7 +574,6 @@ Tables_in_information_schema (T%)	Table_type
 TABLES	TEMPORARY
 TABLE_PRIVILEGES	TEMPORARY
 TABLE_CONSTRAINTS	TEMPORARY
-TABLE_NAMES	TEMPORARY
 create table t1(a int);
 ERROR 42S02: Unknown table 't1' in information_schema
 use test;
@@ -589,7 +585,6 @@ Tables_in_information_schema (T%)
 TABLES
 TABLE_PRIVILEGES
 TABLE_CONSTRAINTS
-TABLE_NAMES
 select table_name from tables where table_name='user';
 table_name
 user
@@ -644,3 +639,5 @@ constraint_name
 drop view t2;
 drop view t3;
 drop table t4;
+select * from information_schema.table_names;
+ERROR 42S02: Unknown table 'table_names' in information_schema

mysql-test/t/information_schema.test

@@ -325,3 +325,9 @@ where table_schema='test';
 drop view t2;
 drop view t3;
 drop table t4;
+
+#
+# Bug#7213: information_schema: redundant non-standard TABLE_NAMES table
+#
+--error 1109
+select * from information_schema.table_names;

sql/sql_parse.cc

@@ -5280,7 +5280,9 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
                      information_schema_name.str))
   {
     ST_SCHEMA_TABLE *schema_table= find_schema_table(thd, ptr->real_name);
-    if (!schema_table)
+    if (!schema_table ||
+        (schema_table->hidden && 
+         lex->orig_sql_command == SQLCOM_END))  // not a 'show' command
     {
       my_error(ER_UNKNOWN_TABLE, MYF(0),
                ptr->real_name, information_schema_name.str);

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}
 };
 
 

sql/table.h

@@ -254,6 +254,7 @@ typedef struct st_schema_table
                         TABLE *table, bool res, const char *base_name,
                         const char *file_name);
   int idx_field1, idx_field2; 
+  bool hidden;
 } ST_SCHEMA_TABLE;