Merge fix for BUG#9439 from 4.1

mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged

2 files changed, 32 insertions, 0 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index add4e91c725..7ecfc8059fd 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -476,3 +476,24 @@ t1	CREATE TABLE `t1` (
   KEY `i` USING BTREE (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
+CREATE TABLE t1(
+field1 text NOT NULL,
+PRIMARY KEY(field1(1000))
+);
+show index from t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					Table	253	64	2	N	129	31	63
+def					Non_unique	1	1	1	N	32929	0	63
+def					Key_name	253	64	7	N	129	31	63
+def					Seq_in_index	1	2	1	N	32929	0	63
+def					Column_name	253	64	6	N	129	31	63
+def					Collation	253	1	1	Y	128	31	63
+def					Cardinality	8	21	1	Y	32896	0	63
+def					Sub_part	2	3	4	Y	32928	0	63
+def					Packed	253	10	0	Y	128	31	63
+def					Null	253	3	0	N	129	31	63
+def					Index_type	253	16	5	N	129	31	63
+def					Comment	253	255	0	N	129	31	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;
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 558adab5313..f74ffc4f4f5 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -365,3 +365,14 @@ SHOW CREATE TABLE t1;
 ALTER TABLE t1 ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+# Test for BUG#9439 "Reporting wrong datatype for sub_part on show index"
+CREATE TABLE t1(
+  field1 text NOT NULL,
+  PRIMARY KEY(field1(1000))
+);
+--enable_metadata
+show index from t1;
+--disable_metadata
+drop table t1;
+