Skip to content

M
mariadb
Commit 10d0dca6 authored by unknown's avatar unknown
Browse files
Options

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
parent 9fc19ce8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 164 deletions
mysql-test/r/connect.result
View file @ 10d0dca6
show tables; show tables;
Tables_in_mysql Type Tables_in_mysql table_type
columns_priv table columns_priv BASE TABLE
db table db BASE TABLE
func table func BASE TABLE
help_category table help_category BASE TABLE
help_keyword table help_keyword BASE TABLE
help_relation table help_relation BASE TABLE
help_topic table help_topic BASE TABLE
host table host BASE TABLE
proc table proc BASE TABLE
tables_priv table tables_priv BASE TABLE
time_zone table time_zone BASE TABLE
time_zone_leap_second table time_zone_leap_second BASE TABLE
time_zone_name table time_zone_name BASE TABLE
time_zone_transition table time_zone_transition BASE TABLE
time_zone_transition_type table time_zone_transition_type BASE TABLE
user table user BASE TABLE
show tables; 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@localhost identified by "gambling";
grant ALL on *.* to test@127.0.0.1 identified by "gambling"; grant ALL on *.* to test@127.0.0.1 identified by "gambling";
show tables; show tables;
Tables_in_mysql Type Tables_in_mysql table_type
columns_priv table columns_priv BASE TABLE
db table db BASE TABLE
func table func BASE TABLE
help_category table help_category BASE TABLE
help_keyword table help_keyword BASE TABLE
help_relation table help_relation BASE TABLE
help_topic table help_topic BASE TABLE
host table host BASE TABLE
proc table proc BASE TABLE
tables_priv table tables_priv BASE TABLE
time_zone table time_zone BASE TABLE
time_zone_leap_second table time_zone_leap_second BASE TABLE
time_zone_name table time_zone_name BASE TABLE
time_zone_transition table time_zone_transition BASE TABLE
time_zone_transition_type table time_zone_transition_type BASE TABLE
user table user BASE TABLE
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
update mysql.user set password=old_password("gambling2") where user=_binary"test"; update mysql.user set password=old_password("gambling2") where user=_binary"test";
flush privileges; flush privileges;
set password=old_password('gambling3'); set password=old_password('gambling3');
show tables; show tables;
Tables_in_mysql Type Tables_in_mysql table_type
columns_priv table columns_priv BASE TABLE
db table db BASE TABLE
func table func BASE TABLE
help_category table help_category BASE TABLE
help_keyword table help_keyword BASE TABLE
help_relation table help_relation BASE TABLE
help_topic table help_topic BASE TABLE
host table host BASE TABLE
proc table proc BASE TABLE
tables_priv table tables_priv BASE TABLE
time_zone table time_zone BASE TABLE
time_zone_leap_second table time_zone_leap_second BASE TABLE
time_zone_name table time_zone_name BASE TABLE
time_zone_transition table time_zone_transition BASE TABLE
time_zone_transition_type table time_zone_transition_type BASE TABLE
user table user BASE TABLE
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
delete from mysql.user where user=_binary"test"; delete from mysql.user where user=_binary"test";
flush privileges; flush privileges;
mysql-test/r/ctype_recoding.result
View file @ 10d0dca6
...@@ -45,8 +45,8 @@ CREATE TABLE ` ...@@ -45,8 +45,8 @@ CREATE TABLE `
CHAR(32) CHARACTER SET koi8r NOT NULL COMMENT " " CHAR(32) CHARACTER SET koi8r NOT NULL COMMENT " "
) COMMENT " "; ) COMMENT " ";
SHOW TABLES; SHOW TABLES;
Tables_in_test Type Tables_in_test table_type
table BASE TABLE
SHOW CREATE TABLE ; SHOW CREATE TABLE ;
Table Create Table Table Create Table
CREATE TABLE `` ( CREATE TABLE `` (
...@@ -57,8 +57,8 @@ Field Type Null Key Default Extra ...@@ -57,8 +57,8 @@ Field Type Null Key Default Extra
char(32) char(32)
SET CHARACTER SET cp1251; SET CHARACTER SET cp1251;
SHOW TABLES; SHOW TABLES;
Tables_in_test Type Tables_in_test table_type
table BASE TABLE
SHOW CREATE TABLE ; SHOW CREATE TABLE ;
Table Create Table Table Create Table
CREATE TABLE `` ( CREATE TABLE `` (
...@@ -69,8 +69,8 @@ Field Type Null Key Default Extra ...@@ -69,8 +69,8 @@ Field Type Null Key Default Extra
char(32) char(32)
SET CHARACTER SET utf8; SET CHARACTER SET utf8;
SHOW TABLES; SHOW TABLES;
Tables_in_test Type Tables_in_test table_type
таблица table таблица BASE TABLE
SHOW CREATE TABLE таблица; SHOW CREATE TABLE таблица;
Table Create Table Table Create Table
таблица CREATE TABLE `таблица` ( таблица CREATE TABLE `таблица` (
...@@ -93,14 +93,14 @@ SET CHARACTER SET koi8r; ...@@ -93,14 +93,14 @@ SET CHARACTER SET koi8r;
CREATE DATABASE ; CREATE DATABASE ;
USE ; USE ;
SHOW TABLES; SHOW TABLES;
Tables_in_ Type Tables_in_ table_type
SHOW TABLES IN ; SHOW TABLES IN ;
Tables_in_ Type Tables_in_ table_type
SET CHARACTER SET cp1251; SET CHARACTER SET cp1251;
SHOW TABLES; SHOW TABLES;
Tables_in_ Type Tables_in_ table_type
SHOW TABLES IN ; SHOW TABLES IN ;
Tables_in_ Type Tables_in_ table_type
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
DROP DATABASE ; DROP DATABASE ;
SET NAMES koi8r; SET NAMES koi8r;
......
mysql-test/r/drop.result
View file @ 10d0dca6
...@@ -52,6 +52,6 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock ...@@ -52,6 +52,6 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables; unlock tables;
create table t1(n int); create table t1(n int);
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
t1 table t1 BASE TABLE
drop table t1; drop table t1;
mysql-test/r/greedy_optimizer.result
View file @ 10d0dca6
This diff is collapsed.
mysql-test/r/lowercase_table.result
View file @ 10d0dca6
...@@ -24,9 +24,9 @@ RENAME TABLE T1 TO T2; ...@@ -24,9 +24,9 @@ RENAME TABLE T1 TO T2;
ALTER TABLE T2 ADD new_col int not null; ALTER TABLE T2 ADD new_col int not null;
ALTER TABLE T2 RENAME T3; ALTER TABLE T2 RENAME T3;
show tables like 't_'; show tables like 't_';
Tables_in_test (t_) Type Tables_in_test (t_) table_type
t3 table t3 BASE TABLE
t4 table t4 BASE TABLE
drop table t3,t4; drop table t3,t4;
create table t1 (a int); create table t1 (a int);
select count(*) from T1; select count(*) from T1;
...@@ -57,4 +57,4 @@ select C.a, c.a from t1 c, t2 C; ...@@ -57,4 +57,4 @@ select C.a, c.a from t1 c, t2 C;
ERROR 42000: Not unique table/alias: 'C' ERROR 42000: Not unique table/alias: 'C'
drop table t1, t2; drop table t1, t2;
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
mysql-test/r/ps_1general.result
View file @ 10d0dca6
...@@ -252,8 +252,8 @@ mysql ...@@ -252,8 +252,8 @@ mysql
test test
prepare stmt4 from ' show tables from test like ''t2%'' '; prepare stmt4 from ' show tables from test like ''t2%'' ';
execute stmt4; execute stmt4;
Tables_in_test (t2%) Type Tables_in_test (t2%) table_type
t2 table t2 BASE TABLE
prepare stmt4 from ' show columns from t2 from test like ''a%'' '; prepare stmt4 from ' show columns from t2 from test like ''a%'' ';
execute stmt4; execute stmt4;
Field Type Null Key Default Extra Field Type Null Key Default Extra
......
mysql-test/r/rename.result
View file @ 10d0dca6
...@@ -19,10 +19,10 @@ Got one of the listed errors ...@@ -19,10 +19,10 @@ Got one of the listed errors
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2; rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
Got one of the listed errors Got one of the listed errors
show tables like "t_"; show tables like "t_";
Tables_in_test (t_) Type Tables_in_test (t_) table_type
t1 table t1 BASE TABLE
t2 table t2 BASE TABLE
t3 table t3 BASE TABLE
rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1; rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
Got one of the listed errors Got one of the listed errors
rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1; rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;
...@@ -44,12 +44,12 @@ CREATE TABLE t3 (a int); ...@@ -44,12 +44,12 @@ CREATE TABLE t3 (a int);
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
RENAME TABLE t1 TO t2, t3 to t4; RENAME TABLE t1 TO t2, t3 to t4;
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
t1 table t1 BASE TABLE
t3 table t3 BASE TABLE
UNLOCK TABLES; UNLOCK TABLES;
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
t2 table t2 BASE TABLE
t4 table t4 BASE TABLE
drop table t2, t4; drop table t2, t4;
mysql-test/r/rpl000009.result
View file @ 10d0dca6
...@@ -73,25 +73,25 @@ mysqltest3 ...@@ -73,25 +73,25 @@ mysqltest3
test test
use mysqltest2; use mysqltest2;
show tables; show tables;
Tables_in_mysqltest2 Type Tables_in_mysqltest2 table_type
t1 table t1 BASE TABLE
t3 table t3 BASE TABLE
select * from t1; select * from t1;
n s n s
1 original foo.t1 1 original foo.t1
use mysqltest3; use mysqltest3;
show tables; show tables;
Tables_in_mysqltest3 Type Tables_in_mysqltest3 table_type
t1 table t1 BASE TABLE
select * from t1; select * from t1;
n s n s
1 original foo2.t1 1 original foo2.t1
use mysqltest; use mysqltest;
show tables; show tables;
Tables_in_mysqltest Type Tables_in_mysqltest table_type
t1 table t1 BASE TABLE
t2 table t2 BASE TABLE
t3 table t3 BASE TABLE
select * from mysqltest.t1; select * from mysqltest.t1;
n s n s
1 one test 1 one test
......
mysql-test/r/rpl_error_ignored_table.result
View file @ 10d0dca6
...@@ -11,7 +11,7 @@ show slave status; ...@@ -11,7 +11,7 @@ show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 273 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 273 # None 0 No # # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 273 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 273 # None 0 No #
show tables like 't1'; show tables like 't1';
Tables_in_test (t1) Type Tables_in_test (t1) table_type
drop table t1; drop table t1;
select get_lock('crash_lock%20C', 10); select get_lock('crash_lock%20C', 10);
get_lock('crash_lock%20C', 10) get_lock('crash_lock%20C', 10)
......
mysql-test/r/select.result
View file @ 10d0dca6
...@@ -2021,15 +2021,15 @@ select period as "Nuvarande period" from t1 group by "Nuvarande period" limit 1; ...@@ -2021,15 +2021,15 @@ select period as "Nuvarande period" from t1 group by "Nuvarande period" limit 1;
Nuvarande period Nuvarande period
9410 9410
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
t1 table t1 BASE TABLE
t2 table t2 BASE TABLE
t3 table t3 BASE TABLE
t4 table t4 BASE TABLE
show tables from test like "s%"; show tables from test like "s%";
Tables_in_test (s%) Type Tables_in_test (s%) table_type
show tables from test like "t?"; show tables from test like "t?";
Tables_in_test (t?) Type Tables_in_test (t?) table_type
show full columns from t2; show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment Field Type Collation Null Key Default Extra Privileges Comment
auto int(11) NULL PRI NULL auto_increment select,insert,update,references auto int(11) NULL PRI NULL auto_increment select,insert,update,references
......
mysql-test/r/system_mysql_db.result
View file @ 10d0dca6
show tables; show tables;
Tables_in_db Type Tables_in_db table_type
columns_priv table columns_priv BASE TABLE
db table db BASE TABLE
func table func BASE TABLE
help_category table help_category BASE TABLE
help_keyword table help_keyword BASE TABLE
help_relation table help_relation BASE TABLE
help_topic table help_topic BASE TABLE
host table host BASE TABLE
proc table proc BASE TABLE
tables_priv table tables_priv BASE TABLE
time_zone table time_zone BASE TABLE
time_zone_leap_second table time_zone_leap_second BASE TABLE
time_zone_name table time_zone_name BASE TABLE
time_zone_transition table time_zone_transition BASE TABLE
time_zone_transition_type table time_zone_transition_type BASE TABLE
user table user BASE TABLE
show create table db; show create table db;
Table Create Table Table Create Table
db CREATE TABLE `db` ( db CREATE TABLE `db` (
......
mysql-test/r/view.result
View file @ 10d0dca6
...@@ -130,14 +130,15 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -130,14 +130,15 @@ id select_type table type possible_keys key key_len ref rows Extra
Warnings: Warnings:
Note 1003 select v6.c AS `c` from test.v6 Note 1003 select v6.c AS `c` from test.v6
show tables; show tables;
Tables_in_test Type Tables_in_test table_type
t1 table t1 BASE TABLE
v1 view v1 VIEW
v2 view v2 VIEW
v3 view v3 VIEW
v4 view v4 VIEW
v5 view v5 VIEW
v6 view v6 VIEW
vt1 VIEW
show table status; show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 MyISAM 9 Fixed 5 9 45 38654705663 1024 0 NULL # # NULL latin1_swedish_ci NULL t1 MyISAM 9 Fixed 5 9 45 38654705663 1024 0 NULL # # NULL latin1_swedish_ci NULL
...@@ -147,6 +148,7 @@ v3 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL vie ...@@ -147,6 +148,7 @@ v3 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL vie
v4 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view v4 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view
v5 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view v5 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view
v6 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view v6 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view
vt1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view
drop view v1,v2,v3,v4,v5,v6; drop view v1,v2,v3,v4,v5,v6;
create view v1 (c,d,e,f) as select a,b, create view v1 (c,d,e,f) as select a,b,
a in (select a+2 from t1), a = all (select a from t1) from t1; a in (select a+2 from t1), a = all (select a from t1) from t1;
......
sql/sql_show.cc
View file @ 10d0dca6
...@@ -159,7 +159,7 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild) ...@@ -159,7 +159,7 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
len= FN_LEN - len; len= FN_LEN - len;
field_list.push_back(field); field_list.push_back(field);
if (show_type) if (show_type)
field_list.push_back(new Item_empty_string("Type", 5)); field_list.push_back(new Item_empty_string("table_type", 10));
if (protocol->send_fields(&field_list,1)) if (protocol->send_fields(&field_list,1))
DBUG_RETURN(1); DBUG_RETURN(1);
if (mysql_find_files(thd,&files,db,path,wild,0)) if (mysql_find_files(thd,&files,db,path,wild,0))
...@@ -175,14 +175,16 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild) ...@@ -175,14 +175,16 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
switch (mysql_frm_type(path)) switch (mysql_frm_type(path))
{ {
case FRMTYPE_ERROR: case FRMTYPE_ERROR:
protocol->store("error", system_charset_info); protocol->store("ERROR", system_charset_info);
break; break;
case FRMTYPE_TABLE: case FRMTYPE_TABLE:
protocol->store("table", system_charset_info); protocol->store("BASE TABLE", system_charset_info);
break; break;
case FRMTYPE_VIEW: case FRMTYPE_VIEW:
protocol->store("view", system_charset_info); protocol->store("VIEW", system_charset_info);
break; break;
default:
DBUG_ASSERT(0); // this should be impossible
} }
} }
if (protocol->write()) if (protocol->write())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7