Skip to content

M
MariaDB
Commit 0bef3bb8 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

cleanup: remove Item::intro_version 

and partition_info::set_show_version_string - they were
already broken and impossible to maintain
parent d4403198
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5769 additions and 5825 deletions
mysql-test/r/ctype_uca_partitions.result
View file @ 0bef3bb8
......@@ -6,8 +6,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
INSERT INTO t1 VALUES ('A'),('À'),('Á'),('Â'),('Ã'),('Ä'),('Å');
INSERT INTO t1 VALUES ('B');
INSERT INTO t1 VALUES ('C');
......
mysql-test/r/information_schema_part.result
View file @ 0bef3bb8
......@@ -120,9 +120,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY LINEAR HASH (a)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM) */
(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM)
select SUBPARTITION_METHOD FROM information_schema.partitions WHERE
table_schema="test" AND table_name="t1";
SUBPARTITION_METHOD
......@@ -138,8 +138,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 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) ENGINE = MyISAM) */
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) ENGINE = MyISAM)
SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE
table_schema = "test" AND table_name = "t1";
PARTITION_DESCRIPTION
......
mysql-test/r/partition.result
View file @ 0bef3bb8
This diff is collapsed.
mysql-test/r/partition_cache_innodb.result
View file @ 0bef3bb8
......@@ -23,10 +23,10 @@ t1 CREATE TABLE `t1` (
`created_at` datetime NOT NULL,
`cool` tinyint(4) DEFAULT 0
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
PARTITION BY RANGE (TO_DAYS(created_at))
(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB,
PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB,
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
INSERT INTO t1 VALUES (1, now(), 0);
flush status;
show status like "Qcache_queries_in_cache";
......@@ -72,12 +72,12 @@ t1 CREATE TABLE `t1` (
`created_at` datetime NOT NULL,
`cool` tinyint(4) DEFAULT 0
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
PARTITION BY RANGE (TO_DAYS(created_at))
SUBPARTITION BY HASH (cool)
SUBPARTITIONS 3
(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB,
PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB,
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
INSERT INTO t1 VALUES (1, now(), 0);
flush status;
show status like "Qcache_queries_in_cache";
......
mysql-test/r/partition_cache_myisam.result
View file @ 0bef3bb8
......@@ -23,10 +23,10 @@ t1 CREATE TABLE `t1` (
`created_at` datetime NOT NULL,
`cool` tinyint(4) DEFAULT 0
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
PARTITION BY RANGE (TO_DAYS(created_at))
(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM,
PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM,
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
INSERT INTO t1 VALUES (1, now(), 0);
flush status;
show status like "Qcache_queries_in_cache";
......@@ -72,12 +72,12 @@ t1 CREATE TABLE `t1` (
`created_at` datetime NOT NULL,
`cool` tinyint(4) DEFAULT 0
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
PARTITION BY RANGE (TO_DAYS(created_at))
SUBPARTITION BY HASH (cool)
SUBPARTITIONS 3
(PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM,
PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM,
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
INSERT INTO t1 VALUES (1, now(), 0);
flush status;
show status like "Qcache_queries_in_cache";
......
mysql-test/r/partition_column.result
View file @ 0bef3bb8
......@@ -30,9 +30,9 @@ t1 CREATE TABLE `t1` (
`department` varchar(10) DEFAULT NULL,
`country` varchar(255) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(department,country)
PARTITION BY LIST COLUMNS(department,country)
(PARTITION first_office VALUES IN (('dep1','Russia'),('dep1','Croatia')) ENGINE = MyISAM,
PARTITION second_office VALUES IN (('dep2','Russia')) ENGINE = MyISAM) */
PARTITION second_office VALUES IN (('dep2','Russia')) ENGINE = MyISAM)
SELECT * FROM t1 WHERE department = 'dep2' and country = 'Croatia';
id name department country
SELECT * FROM t1 WHERE department = 'dep1' and country = 'Croatia';
......@@ -173,10 +173,10 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(5) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN ('''') ENGINE = MyISAM,
PARTITION p1 VALUES IN ('\\') ENGINE = MyISAM,
PARTITION p2 VALUES IN ('\0') ENGINE = MyISAM) */
PARTITION p2 VALUES IN ('\0') ENGINE = MyISAM)
drop table t1;
set @@sql_mode=allow_invalid_dates;
create table t1 (a char, b char, c date)
......@@ -232,13 +232,13 @@ t1 CREATE TABLE `t1` (
`c` varchar(25) DEFAULT NULL,
`d` datetime DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE COLUMNS(a,b,c,d)
PARTITION BY RANGE COLUMNS(a,b,c,d)
SUBPARTITION BY HASH (to_seconds(d))
SUBPARTITIONS 4
(PARTITION p0 VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM,
PARTITION p2 VALUES LESS THAN (1,'b',MAXVALUE,MAXVALUE) ENGINE = MyISAM,
PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) */
PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM)
drop table t1;
create table t1 (a int, b int)
partition by range columns (a,b)
......@@ -315,10 +315,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) */
PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM)
insert into t1 values (3, NULL);
insert into t1 values (NULL, 1);
insert into t1 values (NULL, NULL);
......@@ -349,10 +349,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) */
PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM)
drop table t1;
create table t1 (a int)
partition by list (a)
......@@ -373,9 +373,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
PARTITION p1 VALUES IN (NULL,4,3) ENGINE = MyISAM) */
PARTITION p1 VALUES IN (NULL,4,3) ENGINE = MyISAM)
insert into t1 values (1);
insert into t1 values (2);
insert into t1 values (3);
......@@ -403,9 +403,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) */
PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM)
insert into t1 values (1);
insert into t1 values (2);
insert into t1 values (3);
......@@ -418,9 +418,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) */
PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM)
drop table t1;
create table t1 (a int, b char(10), c varchar(5), d int)
partition by range columns(a,b,c)
......@@ -453,13 +453,13 @@ t1 CREATE TABLE `t1` (
`c` varchar(5) DEFAULT NULL,
`d` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE COLUMNS(a,b,c)
PARTITION BY RANGE COLUMNS(a,b,c)
SUBPARTITION BY KEY (c,d)
SUBPARTITIONS 3
(PARTITION p0 VALUES LESS THAN (1,'abc','abc') ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (2,'abc','abc') ENGINE = MyISAM,
PARTITION p2 VALUES LESS THAN (3,'abc','abc') ENGINE = MyISAM,
PARTITION p3 VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM) */
PARTITION p3 VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM)
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);
......@@ -486,9 +486,9 @@ t1 CREATE TABLE `t1` (
`b` varchar(2) DEFAULT NULL,
`c` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE COLUMNS(a,b,c)
PARTITION BY RANGE COLUMNS(a,b,c)
(PARTITION p0 VALUES LESS THAN (1,'A',1) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (1,'B',1) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (1,'B',1) ENGINE = MyISAM)
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
......
mysql-test/r/partition_datatype.result
View file @ 0bef3bb8
......@@ -329,10 +329,10 @@ t1 CREATE TABLE `t1` (
`a` bit(27) NOT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a)
PARTITION BY HASH (a)
(PARTITION p0 ENGINE = MyISAM,
PARTITION p1 ENGINE = MyISAM,
PARTITION p2 ENGINE = MyISAM) */
PARTITION p2 ENGINE = MyISAM)
insert into t1 values (1),(4),(7),(10),(13),(16),(19),(22),(25),(28),(31),(34);
select hex(a) from t1 where a = 7;
hex(a)
......@@ -850,7 +850,7 @@ t2 CREATE TABLE `t2` (
`a` timestamp NULL DEFAULT NULL,
`tz` varchar(16) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a))
PARTITION BY RANGE (UNIX_TIMESTAMP(a))
(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM,
PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM,
......@@ -859,7 +859,7 @@ t2 CREATE TABLE `t2` (
PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM,
PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM,
PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM,
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
TRUNCATE TABLE t2;
SET @@session.time_zone = 'Europe/Moscow';
INSERT INTO t2 SELECT * FROM t1;
......@@ -1334,7 +1334,7 @@ t2 CREATE TABLE `t2` (
`a` timestamp NULL DEFAULT NULL,
`tz` varchar(16) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a))
PARTITION BY RANGE (UNIX_TIMESTAMP(a))
(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM,
PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM,
......@@ -1343,7 +1343,7 @@ t2 CREATE TABLE `t2` (
PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM,
PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM,
PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM,
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
TRUNCATE TABLE t2;
DROP TABLE t1, t2;
SET @@session.time_zone= @old_time_zone;
mysql-test/r/partition_default.result
View file @ 0bef3bb8
......@@ -22,10 +22,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
insert into t1 values (4,4);
select * from t1;
......@@ -72,10 +72,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1) ENGINE = MyISAM) */
PARTITION p1 VALUES IN (1) ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
......@@ -100,10 +100,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM) */
PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
......@@ -128,10 +128,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
......@@ -176,10 +176,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1,20) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
partition_name table_rows
......@@ -256,10 +256,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(20,20)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
partition_name table_rows
......@@ -325,10 +325,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a+b)
PARTITION BY LIST (a+b)
(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION p1 VALUES IN (21,0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -362,10 +362,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a+5)
PARTITION BY LIST (a+5)
(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION p1 VALUES IN (0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -832,10 +832,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -866,10 +866,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -900,10 +900,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p2 DEFAULT ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -930,9 +930,9 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
0 0
......@@ -948,10 +948,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM,
PARTITION pd DEFAULT ENGINE = MyISAM) */
PARTITION pd DEFAULT ENGINE = MyISAM)
alter table t1 add partition (PARTITION pdd DEFAULT);
ERROR HY000: Only one DEFAULT partition allowed
alter table t1 drop partition pd;
......@@ -980,10 +980,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM) */
PARTITION p0 DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -1014,10 +1014,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -1048,10 +1048,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 DEFAULT ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
2 5
......@@ -1078,9 +1078,9 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
0 0
......@@ -1096,10 +1096,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM,
PARTITION pd DEFAULT ENGINE = MyISAM) */
PARTITION pd DEFAULT ENGINE = MyISAM)
alter table t1 add partition (PARTITION pdd DEFAULT);
ERROR HY000: Only one DEFAULT partition allowed
alter table t1 drop partition pd;
......@@ -1144,10 +1144,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a,b)
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM) */
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM)
drop table t1;
#
# MDEV-10765: Wrong result - query does not retrieve values from
......
mysql-test/r/partition_error.result
View file @ 0bef3bb8
......@@ -781,9 +781,9 @@ t1 CREATE TABLE `t1` (
`id` int(11) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (YEAR(purchased))
PARTITION BY RANGE (YEAR(purchased))
SUBPARTITION BY HASH (TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>) */
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>)
DROP TABLE t1;
CREATE TABLE t1 (id INT, purchased DATE)
PARTITION BY RANGE(YEAR(purchased))
......@@ -802,11 +802,11 @@ t1 CREATE TABLE `t1` (
`id` int(11) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (YEAR(purchased))
PARTITION BY RANGE (YEAR(purchased))
SUBPARTITION BY HASH (TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN MAXVALUE
(SUBPARTITION sp0 ENGINE = <curr_engine>,
SUBPARTITION sp1 ENGINE = <curr_engine>)) */
SUBPARTITION sp1 ENGINE = <curr_engine>))
DROP TABLE t1;
CREATE TABLE t1 (id INT, purchased DATE)
PARTITION BY RANGE(YEAR(purchased))
......@@ -822,8 +822,8 @@ t1 CREATE TABLE `t1` (
`id` int(11) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (YEAR(purchased))
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>) */
PARTITION BY RANGE (YEAR(purchased))
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>)
DROP TABLE t1;
SET @@sql_mode= @org_mode;
CREATE TABLE t1 (a INTEGER NOT NULL, PRIMARY KEY (a));
......@@ -1783,14 +1783,14 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
SUBPARTITION BY HASH (a)
(PARTITION p1 VALUES IN (1)
(SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM,
SUBPARTITION p1spSecond COMMENT = 'SubPartition comment in p1spSecond' ENGINE = MyISAM),
PARTITION p2 VALUES IN (2)
(SUBPARTITION p2spFirst COMMENT = 'SubPartition comment in p2spFirst' ENGINE = MyISAM,
SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) */
SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM))
SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT
......@@ -1813,14 +1813,14 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
SUBPARTITION BY HASH (a)
(PARTITION p1 VALUES IN (1)
(SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM,
SUBPARTITION p1spSecond ENGINE = MyISAM),
PARTITION p2 VALUES IN (2)
(SUBPARTITION p2spFirst COMMENT = 'Comment in p2' ENGINE = MyISAM,
SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) */
SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM))
SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT
......@@ -1849,14 +1849,14 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
KEY `inx_a` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION pUpTo10 VALUES LESS THAN (10)
(SUBPARTITION `p-10sp0` COMMENT = 'This is a long comment (2050 ascii characters) 50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM,
SUBPARTITION `p-10sp1` COMMENT = 'This is a long comment (2050 ascii characters) 50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM),
PARTITION pMax VALUES LESS THAN MAXVALUE
(SUBPARTITION pMaxsp0 COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM,
SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM)) */
SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters) 50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM))
SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
PARTITION_NAME SUBPARTITION_NAME PARTITION_COMMENT
......
mysql-test/r/partition_example.result
View file @ 0bef3bb8
......@@ -8,9 +8,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
) ENGINE=EXAMPLE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE,
PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */
PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE)
drop table t1;
create table t1 (a int not null)
engine=example ull=12340
......@@ -21,9 +21,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ull`=12340
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE,
PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */
PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE)
drop table t1;
select 1;
1
......
mysql-test/r/partition_exchange.result
View file @ 0bef3bb8
......@@ -28,8 +28,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -64,8 +64,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -112,8 +112,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -172,8 +172,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -232,8 +232,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -292,8 +292,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -349,8 +349,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -406,8 +406,8 @@ Create Table CREATE TABLE `t1` (
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
/*!50100 PARTITION BY HASH (id)
PARTITIONS 2 */
PARTITION BY HASH (id)
PARTITIONS 2
SHOW CREATE TABLE t2;
Table t2
Create Table CREATE TABLE `t2` (
......@@ -496,9 +496,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
1 First value
......@@ -534,9 +534,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
10 Ten
......@@ -594,9 +594,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
1 First value
......@@ -650,9 +650,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SHOW CREATE TABLE tsp;
Table Create Table
tsp CREATE TABLE `tsp` (
......@@ -660,14 +660,14 @@ tsp CREATE TABLE `tsp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION p0 VALUES LESS THAN (100)
(SUBPARTITION sp0 ENGINE = MyISAM,
SUBPARTITION sp1 ENGINE = MyISAM),
PARTITION p1 VALUES LESS THAN MAXVALUE
(SUBPARTITION sp2 ENGINE = MyISAM,
SUBPARTITION sp3 ENGINE = MyISAM)) */
SUBPARTITION sp3 ENGINE = MyISAM))
SELECT * FROM t;
a b
1 First value
......@@ -704,9 +704,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
10 Ten
......@@ -742,9 +742,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
1 First value
......@@ -781,14 +781,14 @@ tsp CREATE TABLE `tsp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION p0 VALUES LESS THAN (100)
(SUBPARTITION sp0 ENGINE = MyISAM,
SUBPARTITION sp1 ENGINE = MyISAM),
PARTITION p1 VALUES LESS THAN MAXVALUE
(SUBPARTITION sp2 ENGINE = MyISAM,
SUBPARTITION sp3 ENGINE = MyISAM)) */
SUBPARTITION sp3 ENGINE = MyISAM))
SELECT * FROM t;
a b
61 Sixty one
......@@ -826,9 +826,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
SELECT * FROM t;
a b
1 First value
......@@ -864,9 +864,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
SELECT * FROM t;
a b
10 Ten
......@@ -905,9 +905,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB
SHOW CREATE TABLE t;
......@@ -924,9 +924,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
# Test different charsets
ALTER TABLE t ENGINE = MyISAM;
CREATE TABLE tmp LIKE t;
......@@ -957,9 +957,9 @@ tp CREATE TABLE `tp` (
`b` varchar(55) DEFAULT NULL,
PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
ERROR HY000: Non matching attribute 'MAX_ROWS' between partition and table
SHOW WARNINGS;
......@@ -988,9 +988,9 @@ tp CREATE TABLE `tp` (
PRIMARY KEY (`a`),
KEY `ba_key` (`b`,`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
SELECT * FROM t;
a b
10 Ten
......@@ -1047,9 +1047,9 @@ tp CREATE TABLE `tp` (
PRIMARY KEY (`a`),
KEY `ba_key` (`b`,`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
ERROR HY000: Table to exchange with partition is temporary: 't'
SHOW CREATE TABLE t;
......@@ -1068,9 +1068,9 @@ tp CREATE TABLE `tp` (
PRIMARY KEY (`a`),
KEY `ba_key` (`b`,`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
DROP TEMPORARY TABLE t;
ALTER TABLE tmp2 RENAME TO t;
# Test non partitioned table
......
mysql-test/r/partition_explicit_prune.result
View file @ 0bef3bb8
......@@ -202,7 +202,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a`),
KEY `b` (`b`,`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION pNeg VALUES LESS THAN (0)
(SUBPARTITION subp0 ENGINE = InnoDB,
......@@ -215,7 +215,7 @@ SUBPARTITION BY HASH (a)
SUBPARTITION subp5 ENGINE = InnoDB),
PARTITION `p100-99999` VALUES LESS THAN (100000)
(SUBPARTITION subp6 ENGINE = InnoDB,
SUBPARTITION subp7 ENGINE = InnoDB)) */
SUBPARTITION subp7 ENGINE = InnoDB))
# First test that the syntax is OK
SHOW CREATE TABLE t1 PARTITION (subp0);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITION (subp0)' at line 1
......@@ -1125,7 +1125,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a`),
KEY `b` (`b`,`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION pNeg VALUES LESS THAN (0)
(SUBPARTITION subp0 ENGINE = InnoDB,
......@@ -1138,7 +1138,7 @@ SUBPARTITION BY HASH (a)
SUBPARTITION subp5 ENGINE = InnoDB),
PARTITION `p100-99999` VALUES LESS THAN (100000)
(SUBPARTITION subp6 ENGINE = InnoDB,
SUBPARTITION subp7 ENGINE = InnoDB)) */
SUBPARTITION subp7 ENGINE = InnoDB))
SELECT * FROM t1;
a b
-4 (pNeg-)subp0, Updated, Updated2, Updated from a = -2
......@@ -1157,7 +1157,7 @@ t2 CREATE TABLE `t2` (
PRIMARY KEY (`a`),
KEY `b` (`b`,`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION pNeg VALUES LESS THAN (0)
(SUBPARTITION subp0 ENGINE = InnoDB,
......@@ -1170,7 +1170,7 @@ SUBPARTITION BY HASH (a)
SUBPARTITION subp5 ENGINE = InnoDB),
PARTITION `p100-99999` VALUES LESS THAN (100000)
(SUBPARTITION subp6 ENGINE = InnoDB,
SUBPARTITION subp7 ENGINE = InnoDB)) */
SUBPARTITION subp7 ENGINE = InnoDB))
SELECT * FROM t2;
a b
10 p10-99
......@@ -1657,7 +1657,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a`),
KEY `b` (`b`,`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a)
(PARTITION pNeg VALUES LESS THAN (0)
(SUBPARTITION subp0 ENGINE = InnoDB,
......@@ -1678,7 +1678,7 @@ SUBPARTITION BY HASH (a)
PARTITION `p3000-299999` VALUES LESS THAN (300000)
(SUBPARTITION subp12 ENGINE = InnoDB,
SUBPARTITION subp13 ENGINE = InnoDB,
SUBPARTITION subp14 ENGINE = InnoDB)) */
SUBPARTITION subp14 ENGINE = InnoDB))
INSERT INTO t1 VALUES (-9, "negative nine"), (-8, "-8"), (-7, "-7"), (-6, "-6"), (-5, "-5"), (-4, "-4"), (-3, "-3"), (-2, "-2"), (-1, "-1");
INSERT INTO t1 VALUES (9, "nine"), (8, "8"), (7, "7"), (6, "6"), (5, "5"), (4, "4"), (3, "3"), (2, "2"), (1, "1");
INSERT INTO t1 VALUES (39, "Thirty nine"), (38, "38"), (37, "37"), (36, "36"), (35, "35"), (34, "34"), (33, "33"), (32, "32"), (31, "31");
......
mysql-test/r/partition_innodb.result
View file @ 0bef3bb8
......@@ -446,7 +446,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (a) */
PARTITION BY KEY (a)
drop table t1;
create table t1 (a int)
engine = innodb
......@@ -460,8 +460,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (0) ENGINE = InnoDB)
drop table t1;
SET SQL_MODE=default;
create table t1
......@@ -539,10 +539,10 @@ t1 CREATE TABLE `t1` (
`int_column` int(11) DEFAULT NULL,
`char_column` char(5) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (int_column)
PARTITION BY RANGE (int_column)
SUBPARTITION BY KEY (char_column)
SUBPARTITIONS 2
(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM)
drop table t1;
CREATE TABLE t1 (a INT) ENGINE=InnoDB
PARTITION BY list(a) (PARTITION p1 VALUES IN (1));
......@@ -587,8 +587,8 @@ t1 CREATE TABLE `t1` (
`b` int(11) NOT NULL,
PRIMARY KEY (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (a)
PARTITIONS 2 */
PARTITION BY KEY (a)
PARTITIONS 2
SELECT * FROM t1;
a b
1 2
......
mysql-test/r/partition_innodb_plugin.result
View file @ 0bef3bb8
......@@ -29,9 +29,9 @@ t1 CREATE TABLE `t1` (
`id2` bigint(20) NOT NULL,
PRIMARY KEY (`id`,`time`)
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8
/*!50100 PARTITION BY RANGE (TO_DAYS(time))
PARTITION BY RANGE (TO_DAYS(time))
(PARTITION p10 VALUES LESS THAN (734708) ENGINE = InnoDB,
PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
DROP TABLE t1;
call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
#
......@@ -62,8 +62,8 @@ t1 CREATE TABLE `t1` (
`user_num` char(10) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
/*!50100 PARTITION BY HASH (id)
PARTITIONS 1 */
PARTITION BY HASH (id)
PARTITIONS 1
SET GLOBAL innodb_file_per_table = OFF;
disconnect con1;
connect con2,localhost,root,,;
......@@ -100,8 +100,8 @@ t1 CREATE TABLE `t1` (
`user_num` char(10) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
/*!50100 PARTITION BY HASH (id)
PARTITIONS 3 */
PARTITION BY HASH (id)
PARTITIONS 3
DROP TABLE t1;
disconnect con2;
connection default;
......
mysql-test/r/partition_mgm.result
View file @ 0bef3bb8
......@@ -24,8 +24,8 @@ t1 CREATE TABLE `t1` (
`f_date` date DEFAULT NULL,
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (YEAR(f_date))
PARTITIONS 2 */
PARTITION BY HASH (YEAR(f_date))
PARTITIONS 2
ALTER TABLE t1 COALESCE PARTITION 1;
SHOW CREATE TABLE t1;
Table Create Table
......@@ -33,8 +33,8 @@ t1 CREATE TABLE `t1` (
`f_date` date DEFAULT NULL,
`f_varchar` varchar(30) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (YEAR(f_date))
PARTITIONS 1 */
PARTITION BY HASH (YEAR(f_date))
PARTITIONS 1
drop table t1;
create table t1 (a int)
partition by list (a)
......@@ -58,8 +58,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a)
PARTITIONS 5 */
PARTITION BY HASH (a)
PARTITIONS 5
DROP TABLE t1;
CREATE TABLE t1 (a INT)
/*!50100 PARTITION BY HASH (a)
......@@ -70,8 +70,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a)
PARTITIONS 5 */
PARTITION BY HASH (a)
PARTITIONS 5
DROP TABLE t1;
CREATE TABLE t1 (a INT)
/*!50100 PARTITION BY HASH (a)
......@@ -81,8 +81,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a)
PARTITIONS 5 */
PARTITION BY HASH (a)
PARTITIONS 5
DROP TABLE t1;
CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) PARTITIONS 5 */;
SHOW CREATE TABLE t1;
......@@ -90,6 +90,6 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a)
PARTITIONS 5 */
PARTITION BY HASH (a)
PARTITIONS 5
DROP TABLE t1;
mysql-test/r/partition_mgm_err.result
View file @ 0bef3bb8
......@@ -145,8 +145,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (a)
PARTITIONS 2 */
PARTITION BY KEY (a)
PARTITIONS 2
DROP TABLE t1;
CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
......
mysql-test/r/partition_myisam.result
View file @ 0bef3bb8
......@@ -27,10 +27,10 @@ Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 CHECKSUM=1
/*!50100 PARTITION BY RANGE (i)
PARTITION BY RANGE (i)
(PARTITION p3 VALUES LESS THAN (3) ENGINE = MyISAM,
PARTITION p5 VALUES LESS THAN (5) ENGINE = MyISAM,
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
DROP TABLE t1;
# Same test without partitioning
CREATE TABLE t1 (
......@@ -131,7 +131,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`a`)
) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (a) */
PARTITION BY KEY (a)
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1;
a
......
mysql-test/r/partition_not_windows.result
View file @ 0bef3bb8
......@@ -31,8 +31,8 @@ Table Create Table
t2 CREATE TABLE `t2` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (i)
(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
PARTITION BY RANGE (i)
(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM)
DROP TABLE t1, t2;
set @@sql_mode=@org_mode;
CREATE TABLE t1(a INT)
......
mysql-test/r/partition_range.result
View file @ 0bef3bb8
......@@ -22,9 +22,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` datetime DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE (TO_DAYS(a))
PARTITION BY RANGE (TO_DAYS(a))
SUBPARTITION BY HASH (to_seconds(a))
(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM) */
(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM)
drop table t1;
create table t1 (a int)
partition by range (a)
......@@ -62,9 +62,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` datetime NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE (TO_SECONDS(a))
PARTITION BY RANGE (TO_SECONDS(a))
(PARTITION p0 VALUES LESS THAN (63340531200) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (63342604800) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (63342604800) ENGINE = MyISAM)
drop table t1;
create table t1 (a date)
partition by range(to_seconds(a))
......@@ -93,9 +93,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` date DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE (to_seconds(a))
PARTITION BY RANGE (to_seconds(a))
(PARTITION p0 VALUES LESS THAN (63240134400) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (63271756800) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (63271756800) ENGINE = MyISAM)
drop table t1;
create table t1 (a datetime)
partition by range(to_seconds(a))
......@@ -123,9 +123,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` datetime DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY RANGE (to_seconds(a))
PARTITION BY RANGE (to_seconds(a))
(PARTITION p0 VALUES LESS THAN (63240177600) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (63271800000) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (63271800000) ENGINE = MyISAM)
drop table t1;
create table t1 (a int, b char(20))
partition by range columns(a,b)
......@@ -153,8 +153,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
drop table t1;
create table t1 (a integer)
partition by range (a)
......@@ -284,10 +284,10 @@ t1 CREATE TABLE `t1` (
`c` int(11) NOT NULL,
PRIMARY KEY (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) */
PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
ALTER TABLE t1
partition by range (a)
partitions 3
......@@ -308,10 +308,10 @@ t1 CREATE TABLE `t1` (
`c` int(11) NOT NULL,
PRIMARY KEY (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) */
PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
drop table if exists t1;
CREATE TABLE t1 (
a int not null,
......@@ -409,14 +409,14 @@ t1 CREATE TABLE `t1` (
`c` int(11) NOT NULL,
PRIMARY KEY (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a+b)
(PARTITION x1 VALUES LESS THAN (1)
(SUBPARTITION x11 ENGINE = MyISAM,
SUBPARTITION x12 ENGINE = MyISAM),
PARTITION x2 VALUES LESS THAN (5)
(SUBPARTITION x21 ENGINE = MyISAM,
SUBPARTITION x22 ENGINE = MyISAM)) */
SUBPARTITION x22 ENGINE = MyISAM))
ALTER TABLE t1 ADD COLUMN d int;
show create table t1;
Table Create Table
......@@ -427,14 +427,14 @@ t1 CREATE TABLE `t1` (
`d` int(11) DEFAULT NULL,
PRIMARY KEY (`a`,`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
SUBPARTITION BY HASH (a+b)
(PARTITION x1 VALUES LESS THAN (1)
(SUBPARTITION x11 ENGINE = MyISAM,
SUBPARTITION x12 ENGINE = MyISAM),
PARTITION x2 VALUES LESS THAN (5)
(SUBPARTITION x21 ENGINE = MyISAM,
SUBPARTITION x22 ENGINE = MyISAM)) */
SUBPARTITION x22 ENGINE = MyISAM))
drop table t1;
CREATE TABLE t1 (
a int not null,
......@@ -658,9 +658,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(20) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)
drop table t1;
create table t1 (a bigint unsigned)
partition by range (a)
......@@ -671,9 +671,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(20) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (a)
PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */
PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)
insert into t1 values (0xFFFFFFFFFFFFFFFF);
ERROR HY000: Table has no partition for value 18446744073709551615
drop table t1;
......
mysql-test/r/partition_symlink.result
View file @ 0bef3bb8
......@@ -22,10 +22,10 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (a)
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
PARTITION p1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */
PARTITION p2 VALUES IN (2) ENGINE = MyISAM)
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
......@@ -158,8 +158,8 @@ Table Create Table
t2 CREATE TABLE `t2` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (i)
(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
PARTITION BY RANGE (i)
(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM)
DROP TABLE t1, t2;
set @@sql_mode=@org_mode;
create table t1 (a int)
......
mysql-test/r/partition_utf8.result
View file @ 0bef3bb8
......@@ -7,8 +7,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM) */
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM)
drop table t1;
create table t1 (a varchar(2) character set cp1250)
partition by list columns (a)
......@@ -18,8 +18,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN ('€') ENGINE = MyISAM) */
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN ('€') ENGINE = MyISAM)
drop table t1;
create table t1 (a varchar(1500), b varchar(1570))
partition by list columns(a,b)
......@@ -45,9 +45,9 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(2) CHARACTER SET ucs2 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN ('†') ENGINE = MyISAM,
PARTITION p1 VALUES IN ('') ENGINE = MyISAM) */
PARTITION p1 VALUES IN ('') ENGINE = MyISAM)
insert into t1 values ('');
insert into t1 values (_ucs2 0x2020);
drop table t1;
mysql-test/suite/archive/partition_archive.result
View file @ 0bef3bb8
......@@ -84,7 +84,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (a) */
PARTITION BY HASH (a)
drop table t1;
CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
f1 VARCHAR(25),
......@@ -109,7 +109,7 @@ t1 CREATE TABLE `t1` (
`f1` varchar(25) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (id)
PARTITION BY RANGE (id)
SUBPARTITION BY HASH (id)
SUBPARTITIONS 2
(PARTITION pa1 VALUES LESS THAN (10) ENGINE = ARCHIVE,
......@@ -122,7 +122,7 @@ SUBPARTITIONS 2
PARTITION pa8 VALUES LESS THAN (80) ENGINE = ARCHIVE,
PARTITION pa9 VALUES LESS THAN (90) ENGINE = ARCHIVE,
PARTITION pa10 VALUES LESS THAN (100) ENGINE = ARCHIVE,
PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
select count(*) from t1;
count(*)
100
......@@ -138,8 +138,8 @@ t1 CREATE TABLE `t1` (
`fld1` int(11) NOT NULL,
PRIMARY KEY (`fld1`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (fld1)
PARTITIONS 5 */
PARTITION BY HASH (fld1)
PARTITIONS 5
ALTER TABLE t1 ENGINE= ARCHIVE;
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
#After the patch, the ENGINE is correctly displayed as MyISAM
......@@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` (
`fld1` int(11) NOT NULL,
PRIMARY KEY (`fld1`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (fld1)
PARTITIONS 5 */
PARTITION BY HASH (fld1)
PARTITIONS 5
#Cleanup.
DROP TABLE t1;
create database mysqltest1;
......
mysql-test/suite/encryption/r/encryption_force.result
View file @ 0bef3bb8
......@@ -31,8 +31,8 @@ Table Create Table
t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
/*!50100 PARTITION BY HASH (a)
PARTITIONS 2 */
PARTITION BY HASH (a)
PARTITIONS 2
alter table t1 encrypted=no;
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
alter table t2 encrypted=yes;
......
mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
View file @ 0bef3bb8
......@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 ANALYZE PARTITION p1,p2;
Table Op Msg_type Msg_text
test.t1 analyze status OK
......@@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
View file @ 0bef3bb8
......@@ -34,8 +34,8 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -56,8 +56,8 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -97,8 +97,8 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -119,8 +119,8 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -160,8 +160,8 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -182,8 +182,8 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -223,8 +223,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -245,8 +245,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -286,8 +286,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -308,8 +308,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -349,8 +349,8 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 5 */
PARTITION BY HASH (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -371,8 +371,8 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1)
PARTITIONS 3 */
PARTITION BY HASH (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -412,8 +412,8 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -434,8 +434,8 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -475,8 +475,8 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -497,8 +497,8 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -538,8 +538,8 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -560,8 +560,8 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -601,8 +601,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -623,8 +623,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -664,8 +664,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -686,8 +686,8 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -727,8 +727,8 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 5 */
PARTITION BY KEY (c1)
PARTITIONS 5
ALTER TABLE t1 COALESCE PARTITION 2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -749,8 +749,8 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (c1)
PARTITIONS 3 */
PARTITION BY KEY (c1)
PARTITIONS 3
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_check.result
View file @ 0bef3bb8
......@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 CHECK PARTITION p1,p2;
Table Op Msg_type Msg_text
test.t1 check status OK
......@@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
View file @ 0bef3bb8
......@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 OPTIMIZE PARTITION p1,p2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
View file @ 0bef3bb8
......@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 REBUILD PARTITION p1,p2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_remove.result
View file @ 0bef3bb8
......@@ -21,7 +21,7 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -60,7 +60,7 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -138,7 +138,7 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -177,7 +177,7 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -216,7 +216,7 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) DEFAULT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -259,7 +259,7 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -298,7 +298,7 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -337,7 +337,7 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -376,7 +376,7 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -415,7 +415,7 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -454,7 +454,7 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY HASH (c1) */
PARTITION BY HASH (c1)
ALTER TABLE t1 REMOVE PARTITIONING;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......
mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
View file @ 0bef3bb8
......@@ -44,12 +44,12 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -71,11 +71,11 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -125,12 +125,12 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -152,11 +152,11 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -206,12 +206,12 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -233,11 +233,11 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -287,12 +287,12 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -314,11 +314,11 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -368,12 +368,12 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -395,11 +395,11 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -449,12 +449,12 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION s2;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION s1;
......@@ -476,11 +476,11 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
View file @ 0bef3bb8
......@@ -41,10 +41,10 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -63,9 +63,9 @@ t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -112,10 +112,10 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -134,9 +134,9 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -183,10 +183,10 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -205,9 +205,9 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -254,10 +254,10 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -276,9 +276,9 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -325,10 +325,10 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -347,9 +347,9 @@ t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -396,10 +396,10 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 DROP PARTITION m1;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 DROP PARTITION m0;
......@@ -418,9 +418,9 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` char(5) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( c1)
PARTITION BY RANGE ( c1)
(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_repair.result
View file @ 0bef3bb8
......@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
ALTER TABLE t1 REPAIR PARTITION p1,p2;
SELECT * FROM t1 ORDER BY c1;
c1 c2
......@@ -46,13 +46,13 @@ t1 CREATE TABLE `t1` (
`c2` char(10) DEFAULT NULL,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
View file @ 0bef3bb8
......@@ -45,12 +45,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -100,12 +100,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -155,12 +155,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -210,12 +210,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -265,12 +265,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -320,12 +320,12 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITIONS 2
(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
View file @ 0bef3bb8
......@@ -53,7 +53,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -63,7 +63,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -121,7 +121,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -131,7 +131,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -199,7 +199,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -257,7 +257,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -267,7 +267,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -325,7 +325,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -335,7 +335,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -393,7 +393,7 @@ t1 CREATE TABLE `t1` (
`name` varchar(30) DEFAULT NULL,
`purchased` date DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE ( YEAR(purchased))
PARTITION BY RANGE ( YEAR(purchased))
SUBPARTITION BY HASH ( TO_DAYS(purchased))
(PARTITION p0 VALUES LESS THAN (1990)
(SUBPARTITION s0 ENGINE = ENGINE,
......@@ -403,7 +403,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
SUBPARTITION s3 ENGINE = ENGINE),
PARTITION p2 VALUES LESS THAN MAXVALUE
(SUBPARTITION s4 ENGINE = ENGINE,
SUBPARTITION s5 ENGINE = ENGINE)) */
SUBPARTITION s5 ENGINE = ENGINE))
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_value.result
View file @ 0bef3bb8
......@@ -15,13 +15,13 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -41,13 +41,13 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -67,13 +67,13 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -93,13 +93,13 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -119,13 +119,13 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY RANGE (c1)
PARTITION BY RANGE (c1)
(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
View file @ 0bef3bb8
......@@ -13,11 +13,11 @@ t1 CREATE TABLE `t1` (
`c1` smallint(6) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (c1)
PARTITION BY LIST (c1)
(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -35,11 +35,11 @@ t1 CREATE TABLE `t1` (
`c1` mediumint(9) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (c1)
PARTITION BY LIST (c1)
(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -57,11 +57,11 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (c1)
PARTITION BY LIST (c1)
(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -79,11 +79,11 @@ t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (c1)
PARTITION BY LIST (c1)
(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
......@@ -101,11 +101,11 @@ t1 CREATE TABLE `t1` (
`c1` bigint(20) DEFAULT NULL,
`c2` int(11) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (c1)
PARTITION BY LIST (c1)
(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
DROP TABLE t1;
SHOW TABLES;
Tables_in_test
mysql-test/suite/federated/federated_partition.result
View file @ 0bef3bb8
......@@ -21,9 +21,9 @@ t1 CREATE TABLE `t1` (
`s1` int(11) NOT NULL,
PRIMARY KEY (`s1`)
) ENGINE=FEDERATED DEFAULT CHARSET=latin1
/*!50100 PARTITION BY LIST (s1)
PARTITION BY LIST (s1)
(PARTITION p1 VALUES IN (1,3) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1' ENGINE = FEDERATED,
PARTITION p2 VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED) */
PARTITION p2 VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED)
insert into t1 values (1), (2), (3), (4);
select * from t1;
s1
......
mysql-test/suite/galera/r/partition.result
View file @ 0bef3bb8
This diff is collapsed.
sql/item.h
View file @ 0bef3bb8
This diff is collapsed.
sql/item_timefunc.h
View file @ 0bef3bb8
This diff is collapsed.
sql/partition_info.cc
View file @ 0bef3bb8
This diff is collapsed.
sql/partition_info.h
View file @ 0bef3bb8
This diff is collapsed.
sql/sql_show.cc
View file @ 0bef3bb8
This diff is collapsed.
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