corrected partition test case results that were put back (24cb5235) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_dd_backuprestore.result

+12 −12

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ t1 CREATE TABLE `t1` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 4
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -184,7 +184,7 @@ t2 CREATE TABLE `t2` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		@@ -193,7 +193,7 @@ t3 CREATE TABLE `t3` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t4;
		Table Create Table
		t4 CREATE TABLE `t4` (
		@@ -202,7 +202,7 @@ t4 CREATE TABLE `t4` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 2
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 2 /
		SHOW CREATE TABLE test.t5;
		Table Create Table
		t5 CREATE TABLE `t5` (
		@@ -211,7 +211,7 @@ t5 CREATE TABLE `t5` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (pk1) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (pk1) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t6;
		Table Create Table
		t6 CREATE TABLE `t6` (
		@@ -220,7 +220,7 @@ t6 CREATE TABLE `t6` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SELECT * FROM information_schema.partitions WHERE table_name= 't1';
		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
		NULL test t1 p0 NULL 1 NULL HASH NULL c3 NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default 0 default
		@@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 4
		) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 4 /
		SHOW CREATE TABLE test.t2;
		Table Create Table
		t2 CREATE TABLE `t2` (
		@@ -350,7 +350,7 @@ t2 CREATE TABLE `t2` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		@@ -359,7 +359,7 @@ t3 CREATE TABLE `t3` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster)
		) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t4;
		Table Create Table
		t4 CREATE TABLE `t4` (
		@@ -368,7 +368,7 @@ t4 CREATE TABLE `t4` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 2
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (c3) PARTITIONS 2 /
		SHOW CREATE TABLE test.t5;
		Table Create Table
		t5 CREATE TABLE `t5` (
		@@ -377,7 +377,7 @@ t5 CREATE TABLE `t5` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (pk1) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (pk1) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		SHOW CREATE TABLE test.t6;
		Table Create Table
		t6 CREATE TABLE `t6` (
		@@ -386,7 +386,7 @@ t6 CREATE TABLE `t6` (
		`c3` int(11) NOT NULL,
		`c4` bit(1) NOT NULL,
		PRIMARY KEY (`pk1`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster) /
		SELECT * FROM information_schema.partitions WHERE table_name= 't1';
		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
		NULL test t1 p0 NULL 1 NULL HASH NULL c3 NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default 0 default

mysql-test/r/ndb_partition_key.result

+7 −7

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ t1 CREATE TABLE `t1` (
		`c` int(11) NOT NULL DEFAULT '0',
		`d` int(11) DEFAULT NULL,
		PRIMARY KEY (`a`,`b`,`c`) USING HASH
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (b) /
		DROP TABLE t1;
		CREATE TABLE t1 (a int not null primary key)
		PARTITION BY KEY(a)
		@@ -97,19 +97,19 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		alter table t1 engine=heap;
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=MEMORY DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY)
		) ENGINE=MEMORY DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) /
		alter table t1 engine=ndb;
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		alter table t1 engine=heap remove partitioning;
		show create table t1;
		Table Create Table
		@@ -123,7 +123,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		alter table t1
		partition by key (a)
		(partition p0 engine=ndb, partition p1 engine=ndb);
		@@ -131,7 +131,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		alter table t1 remove partitioning;
		show create table t1;
		Table Create Table
		@@ -150,7 +150,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) DEFAULT NULL
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) /
		drop table t1;
		CREATE TABLE t1 (
		c1 MEDIUMINT NOT NULL AUTO_INCREMENT,

mysql-test/r/ndb_partition_range.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ t1 CREATE TABLE `t1` (
		`c` int(11) NOT NULL,
		PRIMARY KEY (`b`),
		UNIQUE KEY `a` (`a`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /!50100 PARTITION BY RANGE (b) (PARTITION x1 VALUES LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster) /
		drop table t1;
		CREATE TABLE t1
		(id MEDIUMINT NOT NULL,