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

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into mysql.com:/home/psergey/mysql-4.0-look
This commit is contained in:
unknown
2005-02-28 15:40:45 +03:00
parent 106e12042f df1fab9d45
commit ebdbe9e5c3
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,3 +233,25 @@ c decimal(4,3) YES NULL
d double(4,3) YES NULL d double(4,3) YES NULL
f float(4,3) YES NULL f float(4,3) YES NULL
drop table t1; drop table t1;
CREATE TABLE t1 ( a VARCHAR(20) );
INSERT INTO t1 VALUES ('one'),('two'),('three'),('four'),('five');
CREATE TEMPORARY TABLE t2 ( index (a(20)) ) SELECT a FROM t1 GROUP BY a;
SHOW INDEX FROM t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 X a X X X NULL X X X BTREE
ANALYZE TABLE t2;
Table Op Msg_type Msg_text
test.t2 analyze status OK
SHOW INDEX FROM t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 X a X X X 5 X X X BTREE
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`a` varchar(20) default NULL,
KEY `a` (`a`)
) TYPE=MyISAM
SHOW INDEX FROM t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 X a X X X 5 X X X BTREE
DROP TEMPORARY TABLE t2;

16
mysql-test/t/show_check.test
View File

@ -131,3 +131,19 @@ drop table t1;
create table t1 (c decimal(3,3), d double(3,3), f float(3,3)); create table t1 (c decimal(3,3), d double(3,3), f float(3,3));
show columns from t1; show columns from t1;
drop table t1; drop table t1;
# Fix for BUG#7519: For temporary tables, SHOW INDEX doesn't display index
# cardinality after ANALYZE.
CREATE TABLE t1 ( a VARCHAR(20) );
INSERT INTO t1 VALUES ('one'),('two'),('three'),('four'),('five');
CREATE TEMPORARY TABLE t2 ( index (a(20)) ) SELECT a FROM t1 GROUP BY a;
--replace_column 2 X 4 X 5 X 6 X 8 X 9 X 10 X
SHOW INDEX FROM t2;
ANALYZE TABLE t2;
--replace_column 2 X 4 X 5 X 6 X 8 X 9 X 10 X
SHOW INDEX FROM t2;
SHOW CREATE TABLE t2;
--replace_column 2 X 4 X 5 X 6 X 8 X 9 X 10 X
SHOW INDEX FROM t2;
DROP TEMPORARY TABLE t2;

3
sql/sql_show.cc
View File

@ -686,7 +686,8 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
String *packet= &thd->packet; String *packet= &thd->packet;
KEY *key_info=table->key_info; KEY *key_info=table->key_info;
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME |
HA_STATUS_CONST);
for (uint i=0 ; i < table->keys ; i++,key_info++) for (uint i=0 ; i < table->keys ; i++,key_info++)
{ {
KEY_PART_INFO *key_part= key_info->key_part; KEY_PART_INFO *key_part= key_info->key_part;