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 /mysql-test/t/show_check.test | |
| 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 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index ae58e2fa5e4..6aafbed6b97 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -219,7 +219,7 @@ select @@max_heap_table_size; CREATE TABLE t1 ( a int(11) default NULL, - KEY a TYPE BTREE (a) + KEY a USING BTREE (a) ) ENGINE=HEAP; CREATE TABLE t2 ( @@ -230,7 +230,7 @@ CREATE TABLE t2 ( CREATE TABLE t3 ( a int(11) default NULL, b int(11) default NULL, - KEY a TYPE BTREE (a), + KEY a USING BTREE (a), index(b) ) ENGINE=HEAP; |