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

beautify SHOW INDEX

Browse Source
This commit is contained in:
unknown
2004-02-04 17:42:18 +01:00
parent 9d1f86a3a2
commit c8ff8ec18d
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/fulltext.result
View File

@ -5,6 +5,10 @@ INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
('Only MyISAM tables','support collections'), ('Only MyISAM tables','support collections'),
('Function MATCH ... AGAINST()','is used to do a search'), ('Function MATCH ... AGAINST()','is used to do a search'),
('Full-text search in MySQL', 'implements vector space model'); ('Full-text search in MySQL', 'implements vector space model');
SHOW INDEX FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 a 1 a A NULL NULL NULL YES FULLTEXT
t1 1 a 2 b A NULL NULL NULL YES FULLTEXT
select * from t1 where MATCH(a,b) AGAINST ("collections"); select * from t1 where MATCH(a,b) AGAINST ("collections");
a b a b
Only MyISAM tables support collections Only MyISAM tables support collections
@ -183,7 +187,7 @@ id
show keys from t2; show keys from t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 1 tig 1 ticket A NULL NULL NULL YES BTREE t2 1 tig 1 ticket A NULL NULL NULL YES BTREE
t2 1 tix 1 inhalt A NULL 1 NULL YES FULLTEXT t2 1 tix 1 inhalt A NULL NULL NULL YES FULLTEXT
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (

1
mysql-test/t/fulltext.test
View File

@ -10,6 +10,7 @@ INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
('Only MyISAM tables','support collections'), ('Only MyISAM tables','support collections'),
('Function MATCH ... AGAINST()','is used to do a search'), ('Function MATCH ... AGAINST()','is used to do a search'),
('Full-text search in MySQL', 'implements vector space model'); ('Full-text search in MySQL', 'implements vector space model');
SHOW INDEX FROM t1;
# nl search # nl search

5
sql/sql_show.cc
View File

@ -726,9 +726,8 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
net_store_null(packet); net_store_null(packet);
/* Check if we have a key part that only uses part of the field */ /* Check if we have a key part that only uses part of the field */
if (!key_part->field || if (!(key_info->flags & HA_FULLTEXT) && (!key_part->field ||
key_part->length != key_part->length != table->field[key_part->fieldnr-1]->key_length()))
table->field[key_part->fieldnr-1]->key_length())
{ {
end=int10_to_str((long) key_part->length, buff,10); /* purecov: inspected */ end=int10_to_str((long) key_part->length, buff,10); /* purecov: inspected */
net_store_data(packet,convert,buff,(uint) (end-buff)); /* purecov: inspected */ net_store_data(packet,convert,buff,(uint) (end-buff)); /* purecov: inspected */