--- index_type_hash.result	2013-01-22 22:05:05.246633000 +0400
+++ index_type_hash.reject	2013-01-23 02:50:32.647842015 +0400
@@ -4,7 +4,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	#	#	NULL	NULL	#	HASH		
+t1	1	a	1	a	#	#	NULL	NULL	#	BTREE		
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
@@ -12,8 +12,8 @@
  ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a_b	1	a	#	#	NULL	NULL	#	HASH		a_b index
-t1	1	a_b	2	b	#	#	NULL	NULL	#	HASH		a_b index
+t1	1	a_b	1	a	#	#	NULL	NULL	#	BTREE		a_b index
+t1	1	a_b	2	b	#	#	NULL	NULL	#	BTREE		a_b index
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
@@ -22,8 +22,8 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	#	#	NULL	NULL	#	HASH		
-t1	1	b	1	b	#	#	NULL	NULL	#	HASH		
+t1	1	a	1	a	#	#	NULL	NULL	#	BTREE		
+t1	1	b	1	b	#	#	NULL	NULL	#	BTREE		
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
@@ -31,7 +31,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	a	1	a	#	#	NULL	NULL	#	HASH		
+t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 INSERT INTO t1 (a,b) VALUES (1,'c');
 ERROR 23000: Duplicate entry '1' for key 'a'
@@ -43,7 +43,7 @@
 ALTER TABLE t1 ADD <CUSTOM_INDEX> (a) USING HASH COMMENT 'simple index on a';
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	#	#	NULL	NULL	#	HASH		simple index on a
+t1	1	a	1	a	#	#	NULL	NULL	#	BTREE		simple index on a
 ALTER TABLE t1 DROP KEY a;
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
@@ -52,7 +52,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	a	1	a	#	#	NULL	NULL	#	HASH		
+t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 INSERT INTO t1 (a,b) VALUES (1,'c');
 ERROR 23000: Duplicate entry '1' for key 'a'
@@ -61,7 +61,5 @@
 ALTER TABLE t1 DROP INDEX a;
 INSERT INTO t1 (a,b) VALUES (1,'c');
 ALTER TABLE t1 ADD UNIQUE INDEX a(a) USING HASH;
-ERROR 23000: Duplicate entry '1' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
+# ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY)
 DROP TABLE t1;