diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 13:11:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-12 20:27:25 +0100 |
| commit | 0bef3bb8d0a0c3d25b6e4c707144c96cb0350e99 (patch) | |
| tree | c980515c68e37f13987d38eefe8a010683e7db6a /mysql-test/r | |
| parent | d440319842e564a727a54d2c44f92104bd96e0de (diff) | |
| download | mariadb-git-0bef3bb8d0a0c3d25b6e4c707144c96cb0350e99.tar.gz | |
cleanup: remove Item::intro_version
and partition_info::set_show_version_string - they were
already broken and impossible to maintain
Diffstat (limited to 'mysql-test/r')
21 files changed, 276 insertions, 276 deletions
diff --git a/mysql-test/r/ctype_uca_partitions.result b/mysql-test/r/ctype_uca_partitions.result index 11d4e82e27b..508893522e4 100644 --- a/mysql-test/r/ctype_uca_partitions.result +++ b/mysql-test/r/ctype_uca_partitions.result @@ -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'); diff --git a/mysql-test/r/information_schema_part.result b/mysql-test/r/information_schema_part.result index b34183ebdee..e0a0f28dec6 100644 --- a/mysql-test/r/information_schema_part.result +++ b/mysql-test/r/information_schema_part.result @@ -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 diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 29243beefa9..3b365d6fdde 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -94,8 +94,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` int(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) -PARTITIONS 2 */ + PARTITION BY KEY (a) +PARTITIONS 2 SELECT * FROM t1; a b 0 1 @@ -187,12 +187,12 @@ t1 CREATE TABLE `t1` ( `new_field0` varchar(50) DEFAULT NULL, PRIMARY KEY (`ID`,`aaaa,aaaaa`,`ddddddddd`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY RANGE (ID) + PARTITION BY RANGE (ID) SUBPARTITION BY LINEAR KEY (`ID`,`aaaa,aaaaa`) SUBPARTITIONS 2 (PARTITION p01 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION p11 VALUES LESS THAN (200) ENGINE = MyISAM, - PARTITION p21 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */ + PARTITION p21 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; CREATE TABLE t1 (a INT, b INT) PARTITION BY LIST (a) @@ -264,10 +264,10 @@ t1 CREATE TABLE `t1` ( `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a)) + PARTITION BY RANGE (UNIX_TIMESTAMP(a)) (PARTITION p1 VALUES LESS THAN (1199134800) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1247688000) ENGINE = MyISAM, - PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */ + PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) DROP TABLE t1; create table t1 (a int NOT NULL, b varchar(5) NOT NULL) default charset=utf8 @@ -376,9 +376,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY HASH (a) + PARTITION BY HASH (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) DROP TABLE t1; SET sql_mode=DEFAULT; CREATE TABLE t1 (a INT NOT NULL, KEY(a)) @@ -775,20 +775,20 @@ 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 KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM) */ + PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM) alter table t1 reorganize partition p1 into (partition p1 values less than (3)); show create table t1; 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 KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, - PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) */ + PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) drop table t1; CREATE TABLE t1 ( a int not null, @@ -807,7 +807,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) */ + PARTITION BY KEY (a) drop table t1; CREATE TABLE t1 ( a int not null, @@ -985,8 +985,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY LIST (a) -(PARTITION x1 VALUES IN (1) ENGINE = MEMORY) */ + PARTITION BY LIST (a) +(PARTITION x1 VALUES IN (1) ENGINE = MEMORY) drop table t1; CREATE TABLE t1 (a int, unique(a)) PARTITION BY LIST (a) @@ -1011,8 +1011,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) PARTITION BY RANGE (a) @@ -1040,10 +1040,10 @@ 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) (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM) */ + PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM) drop table t1; CREATE TABLE t1 (a int, b int) PARTITION BY RANGE (a) @@ -1065,7 +1065,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY RANGE (a) + PARTITION BY RANGE (a) (PARTITION x1 VALUES LESS THAN (6) ENGINE = MyISAM, PARTITION x3 VALUES LESS THAN (8) ENGINE = MyISAM, PARTITION x4 VALUES LESS THAN (10) ENGINE = MyISAM, @@ -1073,7 +1073,7 @@ t1 CREATE TABLE `t1` ( PARTITION x6 VALUES LESS THAN (14) ENGINE = MyISAM, PARTITION x7 VALUES LESS THAN (16) ENGINE = MyISAM, PARTITION x8 VALUES LESS THAN (18) ENGINE = MyISAM, - PARTITION x9 VALUES LESS THAN (20) ENGINE = MyISAM) */ + PARTITION x9 VALUES LESS THAN (20) ENGINE = MyISAM) drop table t1; create table t1 (a int not null, b int not null) partition by LIST (a+b) ( partition p0 values in (12), @@ -1128,36 +1128,36 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) alter table t1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) alter table t1 engine=myisam; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) alter table t1 engine=heap; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) alter table t1 remove partitioning; show create table t1; Table Create Table @@ -1175,9 +1175,9 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) alter table t1 add column b int remove partitioning; show create table t1; Table Create Table @@ -1195,9 +1195,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) alter table t1 engine=heap partition by key(a) @@ -1208,9 +1208,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) alter table t1 engine=myisam, add column c int remove partitioning; show create table t1; Table Create Table @@ -1230,9 +1230,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) alter table t1 partition by key (a) (partition p0, partition p1); @@ -1243,9 +1243,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) alter table t1 engine=heap partition by key (a) @@ -1257,9 +1257,9 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, - PARTITION p1 ENGINE = MEMORY) */ + PARTITION p1 ENGINE = MEMORY) alter table t1 partition by key(a) (partition p0, partition p1 engine=heap); @@ -1403,9 +1403,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 HASH (a) -(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) */ +(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) alter table t1 add partition (partition p1 values less than (200) (subpartition subpart21)); show create table t1; @@ -1413,12 +1413,12 @@ 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 HASH (a) (PARTITION p0 VALUES LESS THAN (100) (SUBPARTITION p0sp0 ENGINE = MyISAM), PARTITION p1 VALUES LESS THAN (200) - (SUBPARTITION subpart21 ENGINE = MyISAM)) */ + (SUBPARTITION subpart21 ENGINE = MyISAM)) drop table t1; create table t1 (a int) partition by key (a); @@ -1427,16 +1427,16 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) */ + PARTITION BY KEY (a) alter table t1 add partition (partition p1); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) + PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, - PARTITION p1 ENGINE = MyISAM) */ + PARTITION p1 ENGINE = MyISAM) drop table t1; create table t1 (a int, b int) partition by range (a) @@ -1520,9 +1520,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 (1) ENGINE = MyISAM, - PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */ + PARTITION p2 VALUES IN (2) ENGINE = MyISAM) drop table t1; create table t1 (a int unsigned not null auto_increment primary key) partition by key(a); @@ -1534,7 +1534,7 @@ t2 CREATE TABLE `t2` ( `c` char(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' -/*!50100 PARTITION BY KEY (a) */ + PARTITION BY KEY (a) drop table t2; create table t1 (f1 int) partition by hash (f1) as select 1; drop table t1; @@ -1731,8 +1731,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 (NULL) ENGINE = MyISAM) */ + PARTITION BY LIST (a) +(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) DROP TABLE t1; CREATE TABLE t1 (a int) PARTITION BY RANGE(a) @@ -1769,8 +1769,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) -/*!50100 PARTITION BY KEY (a) -(PARTITION p0) */ + PARTITION BY KEY (a) +(PARTITION p0) set session sql_mode=''; drop table t1; create table t1 (a int) @@ -1785,7 +1785,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) */ + PARTITION BY KEY (a) drop table t1; CREATE TABLE t1 (a int) ENGINE = MYISAM PARTITION BY KEY(a); INSERT into t1 values (1), (2); @@ -1858,8 +1858,8 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY KEY (a) -PARTITIONS 10 */ + PARTITION BY KEY (a) +PARTITIONS 10 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); select * from t1; @@ -2024,9 +2024,9 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY RANGE (b) + PARTITION BY RANGE (b) (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, - PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */ + PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) drop table t1, t2; create table t1 (s1 timestamp on update current_timestamp, s2 int) @@ -2164,12 +2164,12 @@ t1 CREATE TABLE `t1` ( `user` char(25) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=16 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 = MyISAM, PARTITION pa2 VALUES LESS THAN (20) ENGINE = MyISAM, - PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */ + PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) drop table t1; CREATE TABLE t1 ( `ID` bigint(20) NOT NULL AUTO_INCREMENT, diff --git a/mysql-test/r/partition_cache_innodb.result b/mysql-test/r/partition_cache_innodb.result index c12ff3588b0..f0e4f83ddb3 100644 --- a/mysql-test/r/partition_cache_innodb.result +++ b/mysql-test/r/partition_cache_innodb.result @@ -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"; diff --git a/mysql-test/r/partition_cache_myisam.result b/mysql-test/r/partition_cache_myisam.result index d20a8baeab7..2b6c34b1cd9 100644 --- a/mysql-test/r/partition_cache_myisam.result +++ b/mysql-test/r/partition_cache_myisam.result @@ -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"; diff --git a/mysql-test/r/partition_column.result b/mysql-test/r/partition_column.result index a494656a6a6..06d39771466 100644 --- a/mysql-test/r/partition_column.result +++ b/mysql-test/r/partition_column.result @@ -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 diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/r/partition_datatype.result index fa58df3dec3..31d265d95ee 100644 --- a/mysql-test/r/partition_datatype.result +++ b/mysql-test/r/partition_datatype.result @@ -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; diff --git a/mysql-test/r/partition_default.result b/mysql-test/r/partition_default.result index fcf16ba7ccf..2833d92de32 100644 --- a/mysql-test/r/partition_default.result +++ b/mysql-test/r/partition_default.result @@ -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 diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result index f05b145053d..eeea5215218 100644 --- a/mysql-test/r/partition_error.result +++ b/mysql-test/r/partition_error.result @@ -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 diff --git a/mysql-test/r/partition_example.result b/mysql-test/r/partition_example.result index 2129eea0818..9e1a4ccdad9 100644 --- a/mysql-test/r/partition_example.result +++ b/mysql-test/r/partition_example.result @@ -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 diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/r/partition_exchange.result index 0f6ac2cf480..f7b2d7647ff 100644 --- a/mysql-test/r/partition_exchange.result +++ b/mysql-test/r/partition_exchange.result @@ -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 diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/r/partition_explicit_prune.result index 1272ff8c5fc..65b8e8083fe 100644 --- a/mysql-test/r/partition_explicit_prune.result +++ b/mysql-test/r/partition_explicit_prune.result @@ -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"); diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index df0bab4a6b4..46dcfe4231b 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -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 diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result index 16b5daad620..cd5dfade0ab 100644 --- a/mysql-test/r/partition_innodb_plugin.result +++ b/mysql-test/r/partition_innodb_plugin.result @@ -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; diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index 2ff6e3f1923..2acaf7356ef 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -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; diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/r/partition_mgm_err.result index cbf45a2b7be..9cfe0594a0c 100644 --- a/mysql-test/r/partition_mgm_err.result +++ b/mysql-test/r/partition_mgm_err.result @@ -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; diff --git a/mysql-test/r/partition_myisam.result b/mysql-test/r/partition_myisam.result index bb1a7b19a9d..f9f917a2803 100644 --- a/mysql-test/r/partition_myisam.result +++ b/mysql-test/r/partition_myisam.result @@ -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 diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result index a1da9af675b..afde7977961 100644 --- a/mysql-test/r/partition_not_windows.result +++ b/mysql-test/r/partition_not_windows.result @@ -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) diff --git a/mysql-test/r/partition_range.result b/mysql-test/r/partition_range.result index 339f2209cb3..94c727f6339 100644 --- a/mysql-test/r/partition_range.result +++ b/mysql-test/r/partition_range.result @@ -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; diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/r/partition_symlink.result index 387717ab7e7..3f175bb7534 100644 --- a/mysql-test/r/partition_symlink.result +++ b/mysql-test/r/partition_symlink.result @@ -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) diff --git a/mysql-test/r/partition_utf8.result b/mysql-test/r/partition_utf8.result index 339871f1f4a..c359980be51 100644 --- a/mysql-test/r/partition_utf8.result +++ b/mysql-test/r/partition_utf8.result @@ -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; |