diff options
| -rw-r--r-- | mysql-test/r/fulltext.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index e8ae9d3063f..651baad266e 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -5,6 +5,10 @@ INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'), ('Only MyISAM tables','support collections'), ('Function MATCH ... AGAINST()','is used to do a search'), ('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"); a b Only MyISAM tables support collections @@ -183,7 +187,7 @@ id show keys from t2; 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 tix 1 inhalt A NULL 1 NULL YES FULLTEXT +t2 1 tix 1 inhalt A NULL NULL NULL YES FULLTEXT show create table t2; Table Create Table t2 CREATE TABLE `t2` ( diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index e8f5d497692..02657ba3775 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -10,6 +10,7 @@ INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'), ('Only MyISAM tables','support collections'), ('Function MATCH ... AGAINST()','is used to do a search'), ('Full-text search in MySQL', 'implements vector space model'); +SHOW INDEX FROM t1; # nl search diff --git a/sql/sql_show.cc b/sql/sql_show.cc index f62853ce9d6..3d727a33173 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -726,9 +726,8 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) net_store_null(packet); /* Check if we have a key part that only uses part of the field */ - if (!key_part->field || - key_part->length != - table->field[key_part->fieldnr-1]->key_length()) + if (!(key_info->flags & HA_FULLTEXT) && (!key_part->field || + key_part->length != table->field[key_part->fieldnr-1]->key_length())) { end=int10_to_str((long) key_part->length, buff,10); /* purecov: inspected */ net_store_data(packet,convert,buff,(uint) (end-buff)); /* purecov: inspected */ |