diff options
| author | unknown <jimw@mysql.com> | 2005-01-08 22:22:41 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-08 22:22:41 +0100 |
| commit | f2034fdbbad36254837e3363f801480fb4ba5315 (patch) | |
| tree | 38eb3b93c139e14e91f34864fc0ab462beaad1f5 /sql/sql_show.cc | |
| parent | 5802259dc5ca818c53332b360dba09570f4f6e81 (diff) | |
| parent | 895b50d74c772eac555faa69521c3a976a85d1e9 (diff) | |
| download | mariadb-git-f2034fdbbad36254837e3363f801480fb4ba5315.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
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
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 1e284891b90..3aa39e87614 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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); |