standard values for table type in SHOW TABLES (BUG#4603)

mysql-test/r/connect.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ctype_recoding.result:
  standard values for table type in SHOW TABLES
mysql-test/r/drop.result:
  standard values for table type in SHOW TABLES
mysql-test/r/greedy_optimizer.result:
  fixed results
mysql-test/r/lowercase_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ps_1general.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rename.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl000009.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl_error_ignored_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/select.result:
  standard values for table type in SHOW TABLES
mysql-test/r/system_mysql_db.result:
  standard values for table type in SHOW TABLES
mysql-test/r/view.result:
  standard values for table type in SHOW TABLES
sql/sql_show.cc:
  standard values for table type in SHOW TABLES
  debugging trap

1 files changed, 54 insertions, 54 deletions

diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index 9523bdc22fd..b5d0e4d9ae2 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -1,67 +1,67 @@
 show tables;
-Tables_in_mysql	Type
-columns_priv	table
-db	table
-func	table
-help_category	table
-help_keyword	table
-help_relation	table
-help_topic	table
-host	table
-proc	table
-tables_priv	table
-time_zone	table
-time_zone_leap_second	table
-time_zone_name	table
-time_zone_transition	table
-time_zone_transition_type	table
-user	table
+Tables_in_mysql	table_type
+columns_priv	BASE TABLE
+db	BASE TABLE
+func	BASE TABLE
+help_category	BASE TABLE
+help_keyword	BASE TABLE
+help_relation	BASE TABLE
+help_topic	BASE TABLE
+host	BASE TABLE
+proc	BASE TABLE
+tables_priv	BASE TABLE
+time_zone	BASE TABLE
+time_zone_leap_second	BASE TABLE
+time_zone_name	BASE TABLE
+time_zone_transition	BASE TABLE
+time_zone_transition_type	BASE TABLE
+user	BASE TABLE
 show tables;
-Tables_in_test	Type
+Tables_in_test	table_type
 grant ALL on *.* to test@localhost identified by "gambling";
 grant ALL on *.* to test@127.0.0.1 identified by "gambling";
 show tables;
-Tables_in_mysql	Type
-columns_priv	table
-db	table
-func	table
-help_category	table
-help_keyword	table
-help_relation	table
-help_topic	table
-host	table
-proc	table
-tables_priv	table
-time_zone	table
-time_zone_leap_second	table
-time_zone_name	table
-time_zone_transition	table
-time_zone_transition_type	table
-user	table
+Tables_in_mysql	table_type
+columns_priv	BASE TABLE
+db	BASE TABLE
+func	BASE TABLE
+help_category	BASE TABLE
+help_keyword	BASE TABLE
+help_relation	BASE TABLE
+help_topic	BASE TABLE
+host	BASE TABLE
+proc	BASE TABLE
+tables_priv	BASE TABLE
+time_zone	BASE TABLE
+time_zone_leap_second	BASE TABLE
+time_zone_name	BASE TABLE
+time_zone_transition	BASE TABLE
+time_zone_transition_type	BASE TABLE
+user	BASE TABLE
 show tables;
-Tables_in_test	Type
+Tables_in_test	table_type
 update mysql.user set password=old_password("gambling2") where user=_binary"test";
 flush privileges;
 set password=old_password('gambling3');
 show tables;
-Tables_in_mysql	Type
-columns_priv	table
-db	table
-func	table
-help_category	table
-help_keyword	table
-help_relation	table
-help_topic	table
-host	table
-proc	table
-tables_priv	table
-time_zone	table
-time_zone_leap_second	table
-time_zone_name	table
-time_zone_transition	table
-time_zone_transition_type	table
-user	table
+Tables_in_mysql	table_type
+columns_priv	BASE TABLE
+db	BASE TABLE
+func	BASE TABLE
+help_category	BASE TABLE
+help_keyword	BASE TABLE
+help_relation	BASE TABLE
+help_topic	BASE TABLE
+host	BASE TABLE
+proc	BASE TABLE
+tables_priv	BASE TABLE
+time_zone	BASE TABLE
+time_zone_leap_second	BASE TABLE
+time_zone_name	BASE TABLE
+time_zone_transition	BASE TABLE
+time_zone_transition_type	BASE TABLE
+user	BASE TABLE
 show tables;
-Tables_in_test	Type
+Tables_in_test	table_type
 delete from mysql.user where user=_binary"test";
 flush privileges;