Commit 10f57138 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug19067 

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
parents 17e3ee35 661537c7

mysql-test/r/partition.result

+18 −1
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a int)

partition by range (a)

subpartition by key (a)

(partition p0 values less than (1));

alter table t1 add partition (partition p1 values less than (2));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 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 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,

b int not null,
@@ -570,7 +587,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100) )

) ENGINE=MyISAM DEFAULT CHARSET=latin1 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;

mysql-test/r/partition_02myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `f1` int(11) DEFAULT NULL,

  `f2` char(20) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (100) , PARTITION part2 VALUES LESS THAN (2147483647) )

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = MyISAM)

SELECT COUNT(*) = 0 AS my_value FROM t1;

my_value

1
@@ -1098,7 +1098,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `f1` int(11) DEFAULT NULL,

  `f2` char(20) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (100) , PARTITION part2 VALUES LESS THAN (2147483647) )

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = MyISAM)

SELECT COUNT(*) = 0 AS my_value FROM t1;

my_value

1

mysql-test/r/partition_pruning.result

+5 −5
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ f_int1 
NULL

explain partitions select * from t1 where f_int1 is null;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	part4_p2sp0	system	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1	part4_part4sp0	system	NULL	NULL	NULL	NULL	1	

drop table t1;

create table t1 (a int not null, b int not null)

partition by list(a)
@@ -625,16 +625,16 @@ insert into t1 values (1,1),(1,2),(1,3),(1,4), 
(2,1),(2,2),(2,3),(2,4), (NULL,1);

explain partitions select * from t1 where a IS NULL AND (b=1 OR b=2);

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	pn_p3sp0,pn_p3sp1	system	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1	pn_pnsp0,pn_pnsp1	system	NULL	NULL	NULL	NULL	1	

explain partitions select * from t1 where (a IS NULL or a < 1) AND (b=1 OR b=2);

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	pn_p3sp0,pn_p3sp1	system	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1	pn_pnsp0,pn_pnsp1	system	NULL	NULL	NULL	NULL	1	

explain partitions select * from t1 where (a IS NULL or a < 2) AND (b=1 OR b=2);

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,pn_p3sp0,pn_p3sp1	ALL	NULL	NULL	NULL	NULL	5	Using where

1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,pn_pnsp0,pn_pnsp1	ALL	NULL	NULL	NULL	NULL	5	Using where

explain partitions select * from t1 where (a IS NULL or a <= 1) AND (b=1 OR b=2);

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,pn_p3sp0,pn_p3sp1	ALL	NULL	NULL	NULL	NULL	5	Using where

1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,pn_pnsp0,pn_pnsp1	ALL	NULL	NULL	NULL	NULL	5	Using where

drop table t1;

create table t1 ( a int)  partition by list (MOD(a, 10))

( partition p0  values in (0), partition p1 values in (1),

mysql-test/r/partition_range.result

+24 −0
Original line number Diff line number Diff line
@@ -363,3 +363,27 @@ SELECT COUNT(*) FROM t1 WHERE c3 < '2000-12-31'; 
COUNT(*)

10

DROP TABLE t1;

create table t1 (a int)

partition by range (MOD(a,3))

subpartition by hash(a)

subpartitions 2

(partition p0 values less than (1),

partition p1 values less than (2),

partition p2 values less than (3),

partition p3 values less than (4));

ALTER TABLE t1 DROP PARTITION p3;

ALTER TABLE t1 DROP PARTITION p1;

ALTER TABLE t1 DROP PARTITION p2;

drop table t1;

create table t1 (a int)

partition by range (MOD(a,3))

subpartition by hash(a)

subpartitions 2

(partition p0 values less than (1),

partition p1 values less than (2),

partition p2 values less than (3),

partition p3 values less than (4));

ALTER TABLE t1 DROP PARTITION p0;

ALTER TABLE t1 DROP PARTITION p1;

ALTER TABLE t1 DROP PARTITION p2;

drop table t1;

mysql-test/t/partition.test

+14 −0
Original line number Diff line number Diff line
@@ -9,6 +9,19 @@ 
drop table if exists t1;

--enable_warnings



#

# BUG 19067 ALTER TABLE .. ADD PARTITION for subpartitioned table crashes

#

create table t1 (a int)

partition by range (a)

subpartition by key (a)

(partition p0 values less than (1));

alter table t1 add partition (partition p1 values less than (2));

show create table t1;

alter table t1 reorganize partition p1 into (partition p1 values less than (3));

show create table t1;

drop table t1;



#

# Partition by key no partition defined => OK

#
@@ -1009,4 +1022,5 @@ select auto_increment from information_schema.tables where table_name='t1'; 
select * from t1;

drop table t1;





--echo End of 5.1 tests