diff options
| author | jimw@mysql.com <> | 2005-01-13 09:24:07 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-01-13 09:24:07 -0800 |
| commit | 7e1f47022cb9528ee58dc4fa34896c302519e91b (patch) | |
| tree | 51ed73be63359ba9ff2f3f6bf9a712863a4de241 /sql/sql_show.cc | |
| parent | 73a9b29c3ceb9d2a59ee205ceb96704d5e673ece (diff) | |
| parent | d63dc891c1a8cd72316ab221537c7d66df3cedfb (diff) | |
| download | mariadb-git-7e1f47022cb9528ee58dc4fa34896c302519e91b.tar.gz | |
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 88a56d26e35..8929872c466 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1404,14 +1404,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); |