Commit abd09620 authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output 

The partitioning clause is only a very long single line, which is very
hard to interpret for a human. This patch breaks the partitioning
syntax into one line for the partitioning type, and one line per
partition/subpartition.
parent 54eaadf0

mysql-test/r/information_schema_part.result

+7 −2
Original line number Diff line number Diff line
@@ -119,7 +119,10 @@ 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) SUBPARTITION BY LINEAR HASH (a) (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (a)

SUBPARTITION BY LINEAR HASH (a)

(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
@@ -134,7 +137,9 @@ SHOW CREATE TABLE t1; 
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) */

) 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) */

SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE

table_schema = "test" AND table_name = "t1";

PARTITION_DESCRIPTION

mysql-test/r/partition.result

+122 −30
Original line number Diff line number Diff line
@@ -133,7 +133,10 @@ KEY `c1` (`c1`) 
CREATE TABLE `t2` (

`c1` int(11) DEFAULT NULL,

KEY `c1` (`c1`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (c1) (PARTITION a VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION b VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */;

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (c1)

(PARTITION a VALUES LESS THAN (100) ENGINE = MyISAM,

PARTITION b VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */;

INSERT INTO `t1` VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20);

INSERT INTO `t2` VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20);

EXPLAIN PARTITIONS SELECT c1 FROM t1 WHERE (c1 > 2 AND c1 < 5);
@@ -299,13 +302,21 @@ 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) SUBPARTITION BY KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (a)

SUBPARTITION BY KEY (a)

(PARTITION p0 VALUES LESS THAN (1) 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) SUBPARTITION BY KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (a)

SUBPARTITION BY KEY (a)

(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM,

 PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) */

drop table t1;

CREATE TABLE t1 (

a int not null,
@@ -323,7 +334,8 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY (`a`,`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a)  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a) */

drop table t1;

CREATE TABLE t1 (

a int not null,
@@ -500,7 +512,9 @@ show create table t1; 
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) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 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)
@@ -524,7 +538,9 @@ SHOW CREATE TABLE t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (a) PARTITIONS 5  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY HASH (a)

PARTITIONS 5 */

drop table t1;

CREATE TABLE t1 (a int)

PARTITION BY RANGE (a)
@@ -551,7 +567,11 @@ 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 p0 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 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) */

drop table t1;

CREATE TABLE t1 (a int, b int)

PARTITION BY RANGE (a)
@@ -572,7 +592,16 @@ Table Create Table 
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 x1 VALUES LESS THAN (6) ENGINE = MyISAM, PARTITION x3 VALUES LESS THAN (8) ENGINE = MyISAM, PARTITION x4 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION x5 VALUES LESS THAN (12) ENGINE = MyISAM, 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) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 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,

 PARTITION x5 VALUES LESS THAN (12) ENGINE = MyISAM,

 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) */

drop table t1;

create table t1 (a int not null, b int not null) partition by LIST (a+b) (

partition p0 values in (12),
@@ -626,25 +655,37 @@ 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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 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 p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MEMORY,

 PARTITION p1 ENGINE = MEMORY) */

alter table t1 remove partitioning;

show create table t1;

Table	Create Table
@@ -661,7 +702,10 @@ 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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MyISAM,

 PARTITION p1 ENGINE = MyISAM) */

alter table t1 add column b int remove partitioning;

show create table t1;

Table	Create Table
@@ -678,7 +722,10 @@ Table Create Table 
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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MyISAM,

 PARTITION p1 ENGINE = MyISAM) */

alter table t1

engine=heap

partition by key(a)
@@ -688,7 +735,10 @@ Table Create Table 
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 p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MEMORY,

 PARTITION p1 ENGINE = MEMORY) */

alter table t1 engine=myisam, add column c int remove partitioning;

show create table t1;

Table	Create Table
@@ -707,7 +757,10 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MEMORY,

 PARTITION p1 ENGINE = MEMORY) */

alter table t1

partition by key (a)

(partition p0, partition p1);
@@ -717,7 +770,10 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MEMORY,

 PARTITION p1 ENGINE = MEMORY) */

alter table t1

engine=heap

partition by key (a)
@@ -728,7 +784,10 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL,

  `c` int(11) DEFAULT NULL

) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */

) ENGINE=MEMORY DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MEMORY,

 PARTITION p1 ENGINE = MEMORY) */

alter table t1

partition by key(a)

(partition p0, partition p1 engine=heap);
@@ -871,14 +930,23 @@ 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) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (a)

SUBPARTITION BY HASH (a)

(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;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 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)) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 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)) */

drop table t1;

create table t1 (a int)

partition by key (a);
@@ -886,13 +954,17 @@ 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)  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 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 p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

(PARTITION p0 ENGINE = MyISAM,

 PARTITION p1 ENGINE = MyISAM) */

drop table t1;

create table t1 (a int, b int)

partition by range (a)
@@ -969,7 +1041,10 @@ Table Create Table 
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 p1 VALUES IN (1) ENGINE = MyISAM, PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY LIST (a)

(PARTITION p1 VALUES IN (1) 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);
@@ -980,7 +1055,8 @@ t2 CREATE TABLE `t2` ( 
  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,

  `c` char(10) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' /*!50100 PARTITION BY KEY (a)  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment'

/*!50100 PARTITION BY KEY (a) */

drop table t2;

create table t1 (f1 int) partition by hash (f1) as select 1;

drop table t1;
@@ -1177,7 +1253,9 @@ SHOW CREATE TABLE t1; 
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) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY LIST (a)

(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) */

DROP TABLE t1;

CREATE TABLE t1 (a int)

PARTITION BY RANGE(a)
@@ -1213,7 +1291,9 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) /*!50100 PARTITION BY KEY (a) (PARTITION p0) */

)

/*!50100 PARTITION BY KEY (a)

(PARTITION p0) */

set session sql_mode='';

drop table t1;

create table t1 (a int)
@@ -1227,7 +1307,8 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(1) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a)  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a) */

drop table t1;

CREATE TABLE t1 (a int) ENGINE = MYISAM PARTITION BY KEY(a);

INSERT into t1 values (1), (2);
@@ -1299,7 +1380,9 @@ Table Create Table 
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  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a)

PARTITIONS 10 */

insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),

(18446744073709551613), (18446744073709551612);

select * from t1;
@@ -1475,7 +1558,10 @@ Table Create Table 
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 p1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (b)

(PARTITION p1 VALUES LESS THAN (10) 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)
@@ -1612,7 +1698,13 @@ t1 CREATE TABLE `t1` ( 
  `id` mediumint(9) NOT NULL AUTO_INCREMENT,

  `user` char(25) DEFAULT NULL,

  PRIMARY KEY (`id`)

) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 /*!50100 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) */

) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1

/*!50100 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) */

drop table t1;

CREATE TABLE  t1 (

`ID` bigint(20) NOT NULL AUTO_INCREMENT,

mysql-test/r/partition_archive.result

+17 −2
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (a)  */

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

/*!50100 PARTITION BY HASH (a) */

drop table t1;

CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,

f1 VARCHAR(25),
@@ -84,7 +85,21 @@ t1 CREATE TABLE `t1` ( 
  `id` mediumint(9) NOT NULL AUTO_INCREMENT,

  `f1` varchar(25) DEFAULT NULL,

  PRIMARY KEY (`id`)

) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = ARCHIVE, PARTITION pa2 VALUES LESS THAN (20) ENGINE = ARCHIVE, PARTITION pa3 VALUES LESS THAN (30) ENGINE = ARCHIVE, PARTITION pa4 VALUES LESS THAN (40) ENGINE = ARCHIVE, PARTITION pa5 VALUES LESS THAN (50) ENGINE = ARCHIVE, PARTITION pa6 VALUES LESS THAN (60) ENGINE = ARCHIVE, PARTITION pa7 VALUES LESS THAN (70) ENGINE = ARCHIVE, 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) */

) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (id)

SUBPARTITION BY HASH (id)

SUBPARTITIONS 2

(PARTITION pa1 VALUES LESS THAN (10) ENGINE = ARCHIVE,

 PARTITION pa2 VALUES LESS THAN (20) ENGINE = ARCHIVE,

 PARTITION pa3 VALUES LESS THAN (30) ENGINE = ARCHIVE,

 PARTITION pa4 VALUES LESS THAN (40) ENGINE = ARCHIVE,

 PARTITION pa5 VALUES LESS THAN (50) ENGINE = ARCHIVE,

 PARTITION pa6 VALUES LESS THAN (60) ENGINE = ARCHIVE,

 PARTITION pa7 VALUES LESS THAN (70) ENGINE = ARCHIVE,

 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) */

select count(*) from t1;

count(*)

100

mysql-test/r/partition_datatype.result

+5 −1
Original line number Diff line number Diff line
@@ -326,7 +326,11 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `a` bit(27) NOT NULL DEFAULT '\0\0\0\0',

  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM, PARTITION p2 ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY HASH (a)

(PARTITION p0 ENGINE = MyISAM,

 PARTITION p1 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)

mysql-test/r/partition_innodb.result

+10 −3
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ 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)  */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY KEY (a) */

drop table t1;

create table t1 (a int)

engine = innodb
@@ -149,7 +150,9 @@ show create table t1; 
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) */

) ENGINE=InnoDB DEFAULT CHARSET=latin1

/*!50100 PARTITION BY LIST (a)

(PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */

drop table t1;

create table t1

(
@@ -225,5 +228,9 @@ Table Create Table 
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) SUBPARTITION BY KEY (char_column) SUBPARTITIONS 2 (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */

) ENGINE=MyISAM DEFAULT CHARSET=latin1

/*!50100 PARTITION BY RANGE (int_column)

SUBPARTITION BY KEY (char_column)

SUBPARTITIONS 2

(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */

drop table t1;