summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-01-08 06:15:41 +0100
committerjimw@mysql.com <>2005-01-08 06:15:41 +0100
commitf28a18c2d5f57359d0e212db8d48e3c29144e90d (patch)
treecef2fad1bf3da502ba09e57ea86417bfd499e9f5 /sql/sql_show.cc
parentc2eb3bf9f645b2eb42002d74426ed0311b61f612 (diff)
downloadmariadb-git-f28a18c2d5f57359d0e212db8d48e3c29144e90d.tar.gz
Show the index type even for indexes using the default index type in
tables that support multiple index types. (Bug #7235)
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index ba13dd1ff04..a3f497d71ae 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1406,14 +1406,18 @@ store_create_info(THD *thd, TABLE *table, String *packet)
if (!(thd->variables.sql_mode & MODE_NO_KEY_OPTIONS) &&
!limited_mysql_mode && !foreign_db_mode)
{
- if (table->db_type == DB_TYPE_HEAP &&
- key_info->algorithm == HA_KEY_ALG_BTREE)
+ if (key_info->algorithm == HA_KEY_ALG_BTREE)
packet->append(" TYPE BTREE", 11);
+ if (key_info->algorithm == HA_KEY_ALG_HASH)
+ packet->append(" TYPE HASH", 10);
+
// +BAR: send USING only in non-default case: non-spatial rtree
if ((key_info->algorithm == HA_KEY_ALG_RTREE) &&
!(key_info->flags & HA_SPATIAL))
packet->append(" TYPE RTREE", 11);
+
+ // No need to send TYPE FULLTEXT, it is sent as FULLTEXT KEY
}
packet->append(" (", 2);