Hash_index to hash

3 files changed, 170 insertions, 170 deletions

diff --git a/mysql-test/main/long_unique.result b/mysql-test/main/long_unique.result
index 29d5a6b8a04..87b5c589807 100644
--- a/mysql-test/main/long_unique.result
+++ b/mysql-test/main/long_unique.result
@@ -28,7 +28,7 @@ Cardinality	NULL
 Sub_part	NULL
 Packed	NULL
 Null	YES
-Index_type	HASH_INDEX
+Index_type	HASH
 Comment	
 Index_comment	
 
@@ -46,7 +46,7 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAUL
 def	test	t1	a	1	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob	UNI		select,insert,update,references		NEVER	NULL
 select * from information_schema.statistics where table_schema = 'test' and table_name = 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	INDEX_COMMENT
-def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH_INDEX		
+def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH		
 select   * from information_schema.key_column_usage where table_schema= 'test' and table_name= 't1';
 CONSTRAINT_CATALOG	def
 CONSTRAINT_SCHEMA	test
@@ -236,7 +236,7 @@ t1	CREATE TABLE `t1` (
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	a	1	aa	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	aa	A	NULL	NULL	NULL	YES	HASH		
 # try to change the blob unique datatype;
 #this will change index to b tree;
 alter table t1 modify  column aa  int ;
@@ -275,7 +275,7 @@ show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	a	1	aa	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	clm	1	clm_changed	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	clm	1	clm_changed	A	NULL	NULL	NULL	YES	HASH		
 #now drop the unique key;
 alter table t1 drop key clm;
 show create table t1;
@@ -301,7 +301,7 @@ Field	Type	Null	Key	Default	Extra
 a	text	YES	UNI	NULL	
 show keys from 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	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
 insert into t1 values ('ae');
 insert into t1 values ('AE');
 ERROR 23000: Duplicate entry 'AE' for key 'a'
@@ -315,7 +315,7 @@ b	blob	YES	UNI	NULL
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
-t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH		
 insert into t1 values(1,1),(2,2),(3,3);
 insert into t1 values(1,1);
 ERROR 23000: Duplicate entry '1' for key 'b'
@@ -351,10 +351,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	d	1	d	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	d	1	d	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
 
 MyISAM file:         DATADIR/test/t1
 Record format:       Packed
@@ -377,10 +377,10 @@ def	test	t1	d	4	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_c
 def	test	t1	e	5	NULL	YES	varchar	3000	3000	NULL	NULL	NULL	latin1	latin1_swedish_ci	varchar(3000)	UNI		select,insert,update,references		NEVER	NULL
 select * from information_schema.statistics where table_schema = 'test' and table_name = 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	INDEX_COMMENT
-def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	d	1	d	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
+def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	d	1	d	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	e	1	e	A	NULL	NULL	NULL	YES	HASH		
 select * from information_schema.key_column_usage where table_schema= 'test' and table_name= 't1';
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 def	test	a	def	test	t1	a	1	NULL	NULL	NULL	NULL
@@ -544,8 +544,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
 #add column with unique index on blob;
@@ -569,11 +569,11 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
 #try to change the blob unique column name;
 #this will change index to b tree;
 alter table t1 modify  column a  int ,  modify column e int;
@@ -596,7 +596,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH_INDEX		
+t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH		
 t1	0	e	1	e	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
@@ -627,13 +627,13 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH_INDEX		
+t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH		
 t1	0	e	1	e	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	clm1	1	clm_changed1	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	clm2	1	clm_changed2	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	clm1	1	clm_changed1	A	NULL	NULL	NULL	YES	HASH		
+t1	0	clm2	1	clm_changed2	A	NULL	NULL	NULL	YES	HASH		
 #now drop the unique key;
 alter table t1 drop key clm1, drop key clm2;
 show create table t1;
@@ -657,7 +657,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH_INDEX		
+t1	0	d	1	d	A	NULL	65535	NULL	YES	HASH		
 t1	0	e	1	e	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
@@ -698,20 +698,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	NULL	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	1	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	0	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	0	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	NULL	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	NULL	NULL	YES	HASH		
 
 MyISAM file:         DATADIR/test/t1
 Record format:       Packed
@@ -737,20 +737,20 @@ def	test	t1	g	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,inse
 def	test	t1	h	8	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			select,insert,update,references		NEVER	NULL
 select * from information_schema.statistics where table_schema = 'test' and table_name = 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	INDEX_COMMENT
-def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	a	2	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	a	3	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	c	2	d	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	e	1	e	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	e	2	f	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	e	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	e	4	h	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	b	2	d	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-def	test	t1	0	test	b	4	h	A	0	NULL	NULL	YES	HASH_INDEX		
+def	test	t1	0	test	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	a	2	b	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	a	3	c	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+def	test	t1	0	test	c	2	d	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	c	3	e	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	e	1	e	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	e	2	f	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	e	3	g	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	e	4	h	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	b	1	b	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	b	2	d	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	b	3	g	A	0	NULL	NULL	YES	HASH		
+def	test	t1	0	test	b	4	h	A	0	NULL	NULL	YES	HASH		
 select * from information_schema.key_column_usage where table_schema= 'test' and table_name= 't1';
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 def	test	a	def	test	t1	a	1	NULL	NULL	NULL	NULL
@@ -854,20 +854,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	1	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	0	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	0	65535	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 alter table t1 drop column db_row_hash_7  , drop column db_row_hash_5 ,
 drop column db_row_hash_1, drop column db_row_hash_2 ;
 show create table t1;
@@ -888,20 +888,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	1	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	1	e	A	0	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	0	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	0	65535	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 #try to change column names;
 alter table t1 change column a aa blob , change column b bb blob , change column d dd blob;
 show create table t1;
@@ -922,20 +922,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	1	aa	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	bb	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	dd	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	bb	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	dd	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	1	aa	A	0	65535	NULL	YES	HASH		
+t1	0	a	2	bb	A	0	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	2	dd	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	b	1	bb	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	dd	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 alter table t1 change column aa a blob , change column bb b blob , change column dd d blob;
 show create table t1;
 Table	Create Table
@@ -955,20 +955,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	1	a	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	1	a	A	0	65535	NULL	YES	HASH		
+t1	0	a	2	b	A	0	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 #now we will change the data type to int and varchar limit so that we no longer  require hash_index;
 #on key a_b_c;
 alter table t1 modify column a varchar(20) , modify column b varchar(20) , modify column c varchar(20);
@@ -990,20 +990,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH_INDEX		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH		
 t1	0	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	a	2	b	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	a	3	c	A	0	NULL	NULL	YES	BTREE		
-t1	0	c	1	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	c	1	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 #change it back;
 alter table t1 modify column a blob , modify column b blob , modify column c blob;
 show create table t1;
@@ -1024,20 +1024,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	1	a	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	c	3	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	2	f	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	3	g	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	4	h	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	1	a	A	0	NULL	NULL	YES	HASH		
+t1	0	a	2	b	A	0	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	0	NULL	NULL	YES	HASH		
+t1	0	c	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	c	3	e	A	0	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	0	NULL	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 #try to delete blob column in unique;
 truncate table t1;
 #now try to delete keys;
@@ -1058,13 +1058,13 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
-t1	0	b	3	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	4	h	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	2	b	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	3	c	A	0	65535	NULL	YES	HASH		
+t1	0	b	1	b	A	0	65535	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
+t1	0	b	3	g	A	0	NULL	NULL	YES	HASH		
+t1	0	b	4	h	A	0	65535	NULL	YES	HASH		
 drop table t1;
 #now alter table containing some data basically some tests with ignore;
 create table t1 (a blob);
@@ -1092,7 +1092,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	65535	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	65535	NULL	YES	HASH		
 drop table t1;
 #Now with multiple keys;
 create table t1(a blob , b blob, c blob , d blob , e int);
@@ -1130,10 +1130,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	a	2	c	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	NULL	65535	NULL	YES	HASH_INDEX		
-t1	0	b	2	d	A	0	65535	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	65535	NULL	YES	HASH		
+t1	0	a	2	c	A	NULL	65535	NULL	YES	HASH		
+t1	0	b	1	b	A	NULL	65535	NULL	YES	HASH		
+t1	0	b	2	d	A	0	65535	NULL	YES	HASH		
 t1	0	e	1	e	A	0	NULL	NULL	YES	BTREE		
 drop table t1;
 #visibility of db_row_hash 
@@ -1243,9 +1243,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	c	A	0	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	b	2	c	A	0	NULL	NULL	YES	HASH		
 insert into t1 values(concat(repeat('sachin',10000000),'1'),concat(repeat('sachin',10000000),'1'),
 concat(repeat('sachin',10000000),'1'));
 insert into t1 values(concat(repeat('sachin',10000000),'2'),concat(repeat('sachin',10000000),'2'),
@@ -1264,7 +1264,7 @@ Field	Type	Null	Key	Default	Extra
 a	blob	YES	UNI	NULL	
 show keys from 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	A	NULL	3000	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	3000	NULL	YES	HASH		
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1296,10 +1296,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from 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	A	NULL	3500	NULL	YES	HASH_INDEX		
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	0	4500	NULL	YES	HASH_INDEX		
-t1	0	c	2	d	A	0	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	3500	NULL	YES	HASH		
+t1	0	a	2	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	0	4500	NULL	YES	HASH		
+t1	0	c	2	d	A	0	NULL	NULL	YES	HASH		
 drop table t1;
 disconnect newcon;
 connection default;
diff --git a/mysql-test/main/long_unique_update.result b/mysql-test/main/long_unique_update.result
index 6e887ba2e5f..fd826198179 100644
--- a/mysql-test/main/long_unique_update.result
+++ b/mysql-test/main/long_unique_update.result
@@ -21,7 +21,7 @@ Cardinality	NULL
 Sub_part	NULL
 Packed	NULL
 Null	YES
-Index_type	HASH_INDEX
+Index_type	HASH
 Comment	
 Index_comment	
 insert into t1 values(1),(2),(3),(4),(5);
@@ -71,7 +71,7 @@ create table t1 (a int primary key, b blob unique , c int unique );
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
-t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH		
 t1	0	c	1	c	A	NULL	NULL	NULL	YES	BTREE		
 insert into t1 values(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7);
 select * from t1 limit 3;
@@ -130,9 +130,9 @@ drop table t1;
 create table t1 (a blob unique, b blob unique , c blob unique);
 show keys from 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	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	a	1	a	A	NULL	NULL	NULL	YES	HASH		
+t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	c	1	c	A	NULL	NULL	NULL	YES	HASH		
 insert into t1 values(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7);
 select * from t1 limit 3;
 a	b	c
@@ -228,19 +228,19 @@ t1	CREATE TABLE `t1` (
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
-t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	b	2	c	A	NULL	NULL	NULL	YES	HASH_INDEX		
+t1	0	b	1	b	A	NULL	NULL	NULL	YES	HASH		
+t1	0	b	2	c	A	NULL	NULL	NULL	YES	HASH		
 t1	0	b_2	1	b	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	b_2	2	f	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH_INDEX		
-t1	0	e	2	g	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	1	a	A	0	NULL	NULL		HASH_INDEX		
-t1	0	a	2	b	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	3	c	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	4	d	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	5	e	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	6	f	A	0	NULL	NULL	YES	HASH_INDEX		
-t1	0	a	7	g	A	0	NULL	NULL	YES	HASH_INDEX		
+t1	0	e	1	e	A	NULL	NULL	NULL	YES	HASH		
+t1	0	e	2	g	A	0	NULL	NULL	YES	HASH		
+t1	0	a	1	a	A	0	NULL	NULL		HASH		
+t1	0	a	2	b	A	0	NULL	NULL	YES	HASH		
+t1	0	a	3	c	A	0	NULL	NULL	YES	HASH		
+t1	0	a	4	d	A	0	NULL	NULL	YES	HASH		
+t1	0	a	5	e	A	0	NULL	NULL	YES	HASH		
+t1	0	a	6	f	A	0	NULL	NULL	YES	HASH		
+t1	0	a	7	g	A	0	NULL	NULL	YES	HASH		
 insert into t1 values(1,1,1,1,1,1,1),(2,2,2,2,2,2,2),(3,3,3,3,3,3,3),(4,4,4,4,4,4,4),
 (5,5,5,5,5,5,5),(6,6,6,6,6,6,6),(7,7,7,7,7,7,7),(8,8,8,8,8,8,8),(9,9,9,9,9,9,9);
 select * from t1 limit 3;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 885c989e197..c1af93dbeb2 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -6594,7 +6594,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables,
             table->field[9]->set_notnull();
           }
           if (key->flags & HA_LONG_UNIQUE_HASH)
-            table->field[13]->store(STRING_WITH_LEN("HASH_INDEX"), cs);
+            table->field[13]->store(STRING_WITH_LEN("HASH"), cs);
           else
           {
             const char *tmp= show_table->file->index_type(i);