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

Merge mysql.com:/home/jwinstead2/mysql-4.1-7233

Browse Source 
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2005-01-08 22:22:41 +01:00
parent 5802259dc5 895b50d74c
commit f2034fdbba
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_show.cc
View File

@ -889,12 +889,12 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet)
{
if (share->db_type == DB_TYPE_HEAP &&
key_info->algorithm == HA_KEY_ALG_BTREE)
packet->append(" TYPE BTREE", 11);
packet->append(" USING BTREE", 12);
// +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);
packet->append(" USING RTREE", 12);
}
packet->append(" (", 2);