SHOW TABLE STATUS now displays table charset as well

mysql-test/r/show_check.result

@@ -43,7 +43,7 @@ wait_timeout	28800
 show variables like "this_doesn't_exists%";
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
-Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment
+Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Charset	Create_options	Comment
 show databases;
 Database
 mysql

sql/sql_show.cc

@@ -484,6 +484,8 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
   item->maybe_null=1;
   field_list.push_back(item=new Item_datetime("Check_time"));
   item->maybe_null=1;
+  field_list.push_back(item=new Item_empty_string("Charset",32));
+  item->maybe_null=1;
   field_list.push_back(item=new Item_empty_string("Create_options",255));
   item->maybe_null=1;
   field_list.push_back(item=new Item_empty_string("Comment",80));
@@ -559,6 +561,8 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
         localtime_r(&file->check_time,&tm_tmp);
         net_store_data(packet, &tm_tmp);
       }
+      net_store_data(packet, convert, table->table_charset ?
+				      table->table_charset->name : "default");
       {
         char option_buff[350],*ptr;
         ptr=option_buff;