Skip to content

M
MariaDB
Commit b3259e93 authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files
Options

pre push fix of test results

parent 2e1ade56
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
mysql-test/r/information_schema_part.result
View file @ b3259e93
...@@ -37,9 +37,9 @@ partitions 3; ...@@ -37,9 +37,9 @@ partitions 3;
select * from information_schema.partitions where table_schema="test" select * from information_schema.partitions where table_schema="test"
and table_name="t4"; and table_name="t4";
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
def test t4 p0 NULL 1 NULL KEY NULL f1,f2 NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL def test t4 p0 NULL 1 NULL KEY NULL `f1`,`f2` NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL
def test t4 p1 NULL 2 NULL KEY NULL f1,f2 NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL def test t4 p1 NULL 2 NULL KEY NULL `f1`,`f2` NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL
def test t4 p2 NULL 3 NULL KEY NULL f1,f2 NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL def test t4 p2 NULL 3 NULL KEY NULL `f1`,`f2` NULL NULL 0 0 0 # 1024 0 # # NULL NULL default NULL
drop table t1,t2,t3,t4; drop table t1,t2,t3,t4;
create table t1 (a int not null,b int not null,c int not null,primary key (a,b)) create table t1 (a int not null,b int not null,c int not null,primary key (a,b))
partition by range (a) partition by range (a)
...@@ -67,10 +67,10 @@ def test t1 x1 x11 1 1 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default ...@@ -67,10 +67,10 @@ def test t1 x1 x11 1 1 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default
def test t1 x1 x12 1 2 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default t2 def test t1 x1 x12 1 2 RANGE HASH a a+b 1 0 0 0 # 1024 0 # # NULL NULL default t2
def test t1 x2 x21 2 1 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t1 def test t1 x2 x21 2 1 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t1
def test t1 x2 x22 2 2 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t2 def test t1 x2 x22 2 2 RANGE HASH a a+b 5 0 0 0 # 1024 0 # # NULL NULL default t2
def test t2 x1 x11 1 1 RANGE KEY a a 1 0 0 0 # 1024 0 # # NULL NULL default t1 def test t2 x1 x11 1 1 RANGE KEY a `a` 1 0 0 0 # 1024 0 # # NULL NULL default t1
def test t2 x1 x12 1 2 RANGE KEY a a 1 0 0 0 # 1024 0 # # NULL NULL default t2 def test t2 x1 x12 1 2 RANGE KEY a `a` 1 0 0 0 # 1024 0 # # NULL NULL default t2
def test t2 x2 x21 2 1 RANGE KEY a a 5 0 0 0 # 1024 0 # # NULL NULL default t1 def test t2 x2 x21 2 1 RANGE KEY a `a` 5 0 0 0 # 1024 0 # # NULL NULL default t1
def test t2 x2 x22 2 2 RANGE KEY a a 5 0 0 0 # 1024 0 # # NULL NULL default t2 def test t2 x2 x22 2 2 RANGE KEY a `a` 5 0 0 0 # 1024 0 # # NULL NULL default t2
drop table t1,t2; drop table t1,t2;
create table t1 ( create table t1 (
a int not null, a int not null,
......
mysql-test/r/partition_column.result
View file @ b3259e93
...@@ -208,22 +208,22 @@ partition p3 values less than (1, MAXVALUE, MAXVALUE, MAXVALUE)); ...@@ -208,22 +208,22 @@ partition p3 values less than (1, MAXVALUE, MAXVALUE, MAXVALUE));
select partition_method, partition_expression, partition_description select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1"; from information_schema.partitions where table_name = "t1";
partition_method partition_expression partition_description partition_method partition_expression partition_description
RANGE COLUMNS a,b,c,d 1,'0',MAXVALUE,'1900-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'0',MAXVALUE,'1900-01-01'
RANGE COLUMNS a,b,c,d 1,'0',MAXVALUE,'1900-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'0',MAXVALUE,'1900-01-01'
RANGE COLUMNS a,b,c,d 1,'0',MAXVALUE,'1900-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'0',MAXVALUE,'1900-01-01'
RANGE COLUMNS a,b,c,d 1,'0',MAXVALUE,'1900-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'0',MAXVALUE,'1900-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01' RANGE COLUMNS `a`,`b`,`c`,`d` 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,'b',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,'b',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,'b',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'b',MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,'b',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,MAXVALUE,MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,MAXVALUE,MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,MAXVALUE,MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE RANGE COLUMNS `a`,`b`,`c`,`d` 1,MAXVALUE,MAXVALUE,MAXVALUE
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
...@@ -306,9 +306,9 @@ partition p2 values in ((3, NULL), (NULL, 1))); ...@@ -306,9 +306,9 @@ partition p2 values in ((3, NULL), (NULL, 1)));
select partition_method, partition_expression, partition_description select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1"; from information_schema.partitions where table_name = "t1";
partition_method partition_expression partition_description partition_method partition_expression partition_description
LIST COLUMNS a,b (1,NULL),(2,NULL),(NULL,NULL) LIST COLUMNS `a`,`b` (1,NULL),(2,NULL),(NULL,NULL)
LIST COLUMNS a,b (1,1),(2,2) LIST COLUMNS `a`,`b` (1,1),(2,2)
LIST COLUMNS a,b (3,NULL),(NULL,1) LIST COLUMNS `a`,`b` (3,NULL),(NULL,1)
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
...@@ -396,8 +396,8 @@ partition p1 values in (4, NULL, 3)); ...@@ -396,8 +396,8 @@ partition p1 values in (4, NULL, 3));
select partition_method, partition_expression, partition_description select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1"; from information_schema.partitions where table_name = "t1";
partition_method partition_expression partition_description partition_method partition_expression partition_description
LIST COLUMNS a 2,1 LIST COLUMNS `a` 2,1
LIST COLUMNS a 4,NULL,3 LIST COLUMNS `a` 4,NULL,3
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
...@@ -433,18 +433,18 @@ partition p3 values less than (4,'abc','abc')); ...@@ -433,18 +433,18 @@ partition p3 values less than (4,'abc','abc'));
select partition_method, partition_expression, partition_description select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1"; from information_schema.partitions where table_name = "t1";
partition_method partition_expression partition_description partition_method partition_expression partition_description
RANGE COLUMNS a,b,c 1,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 1,'abc','abc'
RANGE COLUMNS a,b,c 1,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 1,'abc','abc'
RANGE COLUMNS a,b,c 1,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 1,'abc','abc'
RANGE COLUMNS a,b,c 2,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 2,'abc','abc'
RANGE COLUMNS a,b,c 2,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 2,'abc','abc'
RANGE COLUMNS a,b,c 2,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 2,'abc','abc'
RANGE COLUMNS a,b,c 3,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 3,'abc','abc'
RANGE COLUMNS a,b,c 3,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 3,'abc','abc'
RANGE COLUMNS a,b,c 3,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 3,'abc','abc'
RANGE COLUMNS a,b,c 4,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 4,'abc','abc'
RANGE COLUMNS a,b,c 4,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 4,'abc','abc'
RANGE COLUMNS a,b,c 4,'abc','abc' RANGE COLUMNS `a`,`b`,`c` 4,'abc','abc'
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
...@@ -477,8 +477,8 @@ partition p1 values less than (1, 'B', 1)); ...@@ -477,8 +477,8 @@ partition p1 values less than (1, 'B', 1));
select partition_method, partition_expression, partition_description select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1"; from information_schema.partitions where table_name = "t1";
partition_method partition_expression partition_description partition_method partition_expression partition_description
RANGE COLUMNS a,b,c 1,'A',1 RANGE COLUMNS `a`,`b`,`c` 1,'A',1
RANGE COLUMNS a,b,c 1,'B',1 RANGE COLUMNS `a`,`b`,`c` 1,'B',1
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7