Merge neptunus.(none):/home/msvensson/mysql/bug11635/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/show_check.result

@@ -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,
+  `c2` int(11) NOT NULL,
+  PRIMARY KEY  USING HASH (`c1`),
+  KEY `c2` USING BTREE (`c2`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;

mysql-test/t/show_check.test

@@ -376,3 +376,12 @@ show index from t1;
 --disable_metadata
 drop table t1;
 
+# Test for BUG#11635: mysqldump exports TYPE instead of USING for HASH
+create table t1 (
+  c1 int NOT NULL,
+  c2 int NOT NULL,
+  PRIMARY KEY USING HASH (c1),
+  INDEX USING BTREE(c2)
+);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;