BUG#20161: LINEAR keyword on subpartitions not displayed in information schema for partitions

and in SHOW CREATE TABLE


mysql-test/r/information_schema_part.result:
  Added new test cases
mysql-test/t/information_schema_part.test:
  Added new test cases
sql/sql_partition.cc:
  Added missing check for LINEAR keyword on subpartitions
sql/sql_show.cc:
  Added missing check for LINEAR keyword on subpartitions
  Small remove of duplicate code

1 files changed, 22 insertions, 0 deletions

diff --git a/mysql-test/t/information_schema_part.test b/mysql-test/t/information_schema_part.test
index 163b04248b8..4cbf21ca1d3 100644
--- a/mysql-test/t/information_schema_part.test
+++ b/mysql-test/t/information_schema_part.test
@@ -99,3 +99,25 @@ select * from information_schema.partitions where table_schema="test"
 and table_name="t1";
 drop table t1;
 
+#
+# Bug 20161 Partitions: SUBPARTITION METHOD doesn't show LINEAR keyword
+#
+create table t1 (a int)
+PARTITION BY RANGE (a)
+SUBPARTITION BY LINEAR HASH (a)
+(PARTITION p0 VALUES LESS THAN (10));
+
+SHOW CREATE TABLE t1;
+select SUBPARTITION_METHOD FROM information_schema.partitions WHERE
+table_schema="test" AND table_name="t1";
+drop table t1;
+
+create table t1 (a int)
+PARTITION BY LIST (a)
+(PARTITION p0 VALUES IN
+(10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
+ 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53));
+SHOW CREATE TABLE t1;
+SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE
+table_schema = "test" AND table_name = "t1";
+drop table t1;