database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SHOW TABLE STATUS now displays table charset as well

Browse Source
This commit is contained in:
unknown
2002-10-01 13:54:59 +05:00
parent ce5696e25d
commit 9564cd43d2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/show_check.result
View File

@ -43,7 +43,7 @@ wait_timeout 28800
show variables like "this_doesn't_exists%"; show variables like "this_doesn't_exists%";
Variable_name Value Variable_name Value
show table status from test like "this_doesn't_exists%"; 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; show databases;
Database Database
mysql mysql

4
sql/sql_show.cc
View File

@ -484,6 +484,8 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
item->maybe_null=1; item->maybe_null=1;
field_list.push_back(item=new Item_datetime("Check_time")); field_list.push_back(item=new Item_datetime("Check_time"));
item->maybe_null=1; 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)); field_list.push_back(item=new Item_empty_string("Create_options",255));
item->maybe_null=1; item->maybe_null=1;
field_list.push_back(item=new Item_empty_string("Comment",80)); 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); localtime_r(&file->check_time,&tm_tmp);
net_store_data(packet, &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; char option_buff[350],*ptr;
ptr=option_buff; ptr=option_buff;