Fixed Information schema for column list partitioned tables

1 files changed, 55 insertions, 0 deletions

diff --git a/mysql-test/r/partition_column.result b/mysql-test/r/partition_column.result
index fb7f815fd98..c4333f9c101 100644
--- a/mysql-test/r/partition_column.result
+++ b/mysql-test/r/partition_column.result
@@ -50,6 +50,12 @@ partition by list column_list(a,b)
 column_list(NULL, NULL)),
 partition p1 values in (column_list(1,1), column_list(2,2)),
 partition p2 values in (column_list(3, NULL), column_list(NULL, 1)));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+LIST COLUMN_LIST	a,b	(1,NULL),(2,NULL),(NULL,NULL)
+LIST COLUMN_LIST	a,b	(1,1),(2,2)
+LIST COLUMN_LIST	a,b	(3,NULL),(NULL,1)
 insert into t1 values (3, NULL);
 insert into t1 values (NULL, 1);
 insert into t1 values (NULL, NULL);
@@ -94,6 +100,11 @@ create table t1 (a int)
 partition by list (a)
 ( partition p0 values in (2, 1),
 partition p1 values in (4, NULL, 3));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+LIST	a	2,1
+LIST	a	NULL,4,3
 insert into t1 values (1);
 insert into t1 values (2);
 insert into t1 values (3);
@@ -106,6 +117,11 @@ create table t1 (a int)
 partition by list column_list(a)
 ( partition p0 values in (column_list(2), column_list(1)),
 partition p1 values in (column_list(4), column_list(NULL), column_list(3)));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+LIST COLUMN_LIST	a	2,1
+LIST COLUMN_LIST	a	4,NULL,3
 insert into t1 values (1);
 insert into t1 values (2);
 insert into t1 values (3);
@@ -130,6 +146,25 @@ subpartitions 4
 partition p1 values less than (column_list(1, 'a', MAXVALUE, TO_DAYS('1999-01-01'))),
 partition p2 values less than (column_list(1, 'a', MAXVALUE, MAXVALUE)),
 partition p3 values less than (column_list(1, MAXVALUE, MAXVALUE, MAXVALUE)));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+RANGE COLUMN_LIST	a,b,c,d	1,NULL,MAXVALUE,NULL
+RANGE COLUMN_LIST	a,b,c,d	1,NULL,MAXVALUE,NULL
+RANGE COLUMN_LIST	a,b,c,d	1,NULL,MAXVALUE,NULL
+RANGE COLUMN_LIST	a,b,c,d	1,NULL,MAXVALUE,NULL
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,730120
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,730120
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,730120
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,730120
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,'a',MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,MAXVALUE,MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,MAXVALUE,MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,MAXVALUE,MAXVALUE,MAXVALUE
+RANGE COLUMN_LIST	a,b,c,d	1,MAXVALUE,MAXVALUE,MAXVALUE
 drop table t1;
 create table t1 (a int, b char(10), c varchar(5), d int)
 partition by range column_list(a,b,c)
@@ -139,6 +174,21 @@ subpartitions 3
 partition p1 values less than (column_list(2,'abc','abc')),
 partition p2 values less than (column_list(3,'abc','abc')),
 partition p3 values less than (column_list(4,'abc','abc')));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+RANGE COLUMN_LIST	a,b,c	1,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	1,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	1,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	2,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	2,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	2,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	3,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	3,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	3,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	4,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	4,'abc','abc'
+RANGE COLUMN_LIST	a,b,c	4,'abc','abc'
 insert into t1 values (1,'a','b',1),(2,'a','b',2),(3,'a','b',3);
 insert into t1 values (1,'b','c',1),(2,'b','c',2),(3,'b','c',3);
 insert into t1 values (1,'c','d',1),(2,'c','d',2),(3,'c','d',3);
@@ -153,6 +203,11 @@ create table t1 (a int, b varchar(2), c int)
 partition by range column_list (a, b, c)
 (partition p0 values less than (column_list(1, 'A', 1)),
 partition p1 values less than (column_list(1, 'B', 1)));
+select partition_method, partition_expression, partition_description
+from information_schema.partitions where table_name = "t1";
+partition_method	partition_expression	partition_description
+RANGE COLUMN_LIST	a,b,c	1,'A',1
+RANGE COLUMN_LIST	a,b,c	1,'B',1
 insert into t1 values (1, 'A', 1);
 explain partitions select * from t1 where a = 1 AND b <= 'A' and c = 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra