diff options
| author | msvensson@neptunus.(none) <> | 2005-07-07 15:48:43 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-07-07 15:48:43 +0200 |
| commit | f0548a15baf6d1a5f9de47b6367ef688f9920e3e (patch) | |
| tree | 6bc4950559b0b244984e9b12f1444038fa2a031c /mysql-test/r/show_check.result | |
| parent | 060a53ab255c85aa34dcce657c00ce201b4ffff3 (diff) | |
| parent | 50133499b5479917813c9f61a99b8beb9d6a5d13 (diff) | |
| download | mariadb-git-f0548a15baf6d1a5f9de47b6367ef688f9920e3e.tar.gz | |
Manual merge of BUG#11635 whihc is already in 5.0
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index dd07e0ba755..71ffde5779b 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -420,7 +420,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) default NULL, KEY `i` USING HASH (`i`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=HEAP DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY; SHOW CREATE TABLE t1; @@ -428,7 +428,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) default NULL, KEY `i` USING BTREE (`i`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=HEAP DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM; SHOW CREATE TABLE t1; @@ -474,7 +474,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) default NULL, KEY `i` USING BTREE (`i`) -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=HEAP DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1( field1 text NOT NULL, @@ -497,3 +497,18 @@ def STATISTICS COMMENT Comment 253 16 0 Y 0 0 63 Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 0 PRIMARY 1 field1 A 0 1000 NULL BTREE drop table t1; +create table t1 ( +c1 int NOT NULL, +c2 int NOT NULL, +PRIMARY KEY USING HASH (c1), +INDEX USING BTREE(c2) +); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c1` int(11) NOT NULL default '0', + `c2` int(11) NOT NULL default '0', + PRIMARY KEY USING HASH (`c1`), + KEY `c2` USING BTREE (`c2`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP TABLE t1; |