Commit 3e8008b1 authored by unknown's avatar unknown
Browse files

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


mysql-test/r/partition_range.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge
parents c5d38c17 6b2d502a

mysql-test/r/partition.result

+11 −0
Original line number Diff line number Diff line
@@ -925,6 +925,17 @@ create index inx1 on t1(a); 
drop table t1;

create table t1 (a int)

partition by key (a)

(partition p1 engine = innodb);

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

drop table t1;

create table t1 (a int)

partition by key (a)

(partition p0 engine = MERGE);

ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables

create table t1 (a varchar(1))

mysql-test/r/partition_innodb.result

0 → 100644
+94 −0
Original line number Diff line number Diff line 
SET @max_row = 20;

DROP TABLE IF EXISTS t0_template;

CREATE TABLE t0_template (

f_int1 INTEGER,

f_int2 INTEGER,

f_char1 CHAR(20),

f_char2 CHAR(20),

f_charbig VARCHAR(1000) ,

PRIMARY KEY(f_int1))

ENGINE = MEMORY;

INSERT INTO t0_template

SET f_int1 = 20, f_int2 = 20, f_char1 = '20', f_char2 = '20',

f_charbig = '===20===';

INSERT INTO t0_template

SET f_int1 = 19, f_int2 = 19, f_char1 = '19', f_char2 = '19',

f_charbig = '===19===';

INSERT INTO t0_template

SET f_int1 = 18, f_int2 = 18, f_char1 = '18', f_char2 = '18',

f_charbig = '===18===';

INSERT INTO t0_template

SET f_int1 = 17, f_int2 = 17, f_char1 = '17', f_char2 = '17',

f_charbig = '===17===';

INSERT INTO t0_template

SET f_int1 = 16, f_int2 = 16, f_char1 = '16', f_char2 = '16',

f_charbig = '===16===';

INSERT INTO t0_template

SET f_int1 = 15, f_int2 = 15, f_char1 = '15', f_char2 = '15',

f_charbig = '===15===';

INSERT INTO t0_template

SET f_int1 = 14, f_int2 = 14, f_char1 = '14', f_char2 = '14',

f_charbig = '===14===';

INSERT INTO t0_template

SET f_int1 = 13, f_int2 = 13, f_char1 = '13', f_char2 = '13',

f_charbig = '===13===';

INSERT INTO t0_template

SET f_int1 = 12, f_int2 = 12, f_char1 = '12', f_char2 = '12',

f_charbig = '===12===';

INSERT INTO t0_template

SET f_int1 = 11, f_int2 = 11, f_char1 = '11', f_char2 = '11',

f_charbig = '===11===';

INSERT INTO t0_template

SET f_int1 = 10, f_int2 = 10, f_char1 = '10', f_char2 = '10',

f_charbig = '===10===';

INSERT INTO t0_template

SET f_int1 = 9, f_int2 = 9, f_char1 = '9', f_char2 = '9',

f_charbig = '===9===';

INSERT INTO t0_template

SET f_int1 = 8, f_int2 = 8, f_char1 = '8', f_char2 = '8',

f_charbig = '===8===';

INSERT INTO t0_template

SET f_int1 = 7, f_int2 = 7, f_char1 = '7', f_char2 = '7',

f_charbig = '===7===';

INSERT INTO t0_template

SET f_int1 = 6, f_int2 = 6, f_char1 = '6', f_char2 = '6',

f_charbig = '===6===';

INSERT INTO t0_template

SET f_int1 = 5, f_int2 = 5, f_char1 = '5', f_char2 = '5',

f_charbig = '===5===';

INSERT INTO t0_template

SET f_int1 = 4, f_int2 = 4, f_char1 = '4', f_char2 = '4',

f_charbig = '===4===';

INSERT INTO t0_template

SET f_int1 = 3, f_int2 = 3, f_char1 = '3', f_char2 = '3',

f_charbig = '===3===';

INSERT INTO t0_template

SET f_int1 = 2, f_int2 = 2, f_char1 = '2', f_char2 = '2',

f_charbig = '===2===';

INSERT INTO t0_template

SET f_int1 = 1, f_int2 = 1, f_char1 = '1', f_char2 = '1',

f_charbig = '===1===';

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30)) engine='InnoDB';

INSERT INTO t1 (f_date, f_varchar)

SELECT CONCAT(CAST((f_int1 + 999) AS CHAR),'-02-10'), CAST(f_char1 AS CHAR)

FROM t0_template

WHERE f_int1 + 999 BETWEEN 1000 AND 9999;

SELECT IF(9999 - 1000 + 1 > @max_row, @max_row , 9999 - 1000 + 1)

INTO @exp_row_count;

ALTER TABLE t1 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));

#  1.1.5 Add two named partitions + test

ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);

drop table t1;

CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30))

ENGINE=InnoDB

PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));

# This statement crashes the server.

#   CREATE partitioned table with three partitions in one step

#   would be harmless.

ALTER TABLE t1 ADD PARTITION PARTITIONS 1;

DROP VIEW  IF EXISTS v1;

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t0_aux;

DROP TABLE IF EXISTS t0_definition;

DROP TABLE IF EXISTS t0_template;

mysql-test/r/partition_range.result

+105 −0
Original line number Diff line number Diff line
@@ -387,3 +387,108 @@ ALTER TABLE t1 DROP PARTITION p0; 
ALTER TABLE t1 DROP PARTITION p1;

ALTER TABLE t1 DROP PARTITION p2;

drop table t1;

create table t1 (a int DEFAULT NULL,

b varchar(30) DEFAULT NULL,

c date DEFAULT NULL)

ENGINE=MYISAM DEFAULT CHARSET=latin1;

insert into t1 values (1, 'abc', '1995-01-01');

insert into t1 values (1, 'abc', '1995-01-02');

insert into t1 values (1, 'abc', '1995-01-03');

insert into t1 values (1, 'abc', '1995-01-04');

insert into t1 values (1, 'abc', '1995-01-05');

insert into t1 values (1, 'abc', '1995-01-06');

insert into t1 values (1, 'abc', '1995-01-07');

insert into t1 values (1, 'abc', '1995-01-08');

insert into t1 values (1, 'abc', '1995-01-09');

insert into t1 values (1, 'abc', '1995-01-10');

insert into t1 values (1, 'abc', '1995-01-11');

insert into t1 values (1, 'abc', '1995-01-12');

insert into t1 values (1, 'abc', '1995-01-13');

insert into t1 values (1, 'abc', '1995-01-14');

insert into t1 values (1, 'abc', '1995-01-15');

insert into t1 values (1, 'abc', '1997-01-01');

insert into t1 values (1, 'abc', '1997-01-02');

insert into t1 values (1, 'abc', '1997-01-03');

insert into t1 values (1, 'abc', '1997-01-04');

insert into t1 values (1, 'abc', '1997-01-05');

insert into t1 values (1, 'abc', '1997-01-06');

insert into t1 values (1, 'abc', '1997-01-07');

insert into t1 values (1, 'abc', '1997-01-08');

insert into t1 values (1, 'abc', '1997-01-09');

insert into t1 values (1, 'abc', '1997-01-10');

insert into t1 values (1, 'abc', '1997-01-11');

insert into t1 values (1, 'abc', '1997-01-12');

insert into t1 values (1, 'abc', '1997-01-13');

insert into t1 values (1, 'abc', '1997-01-14');

insert into t1 values (1, 'abc', '1997-01-15');

insert into t1 values (1, 'abc', '1998-01-01');

insert into t1 values (1, 'abc', '1998-01-02');

insert into t1 values (1, 'abc', '1998-01-03');

insert into t1 values (1, 'abc', '1998-01-04');

insert into t1 values (1, 'abc', '1998-01-05');

insert into t1 values (1, 'abc', '1998-01-06');

insert into t1 values (1, 'abc', '1998-01-07');

insert into t1 values (1, 'abc', '1998-01-08');

insert into t1 values (1, 'abc', '1998-01-09');

insert into t1 values (1, 'abc', '1998-01-10');

insert into t1 values (1, 'abc', '1998-01-11');

insert into t1 values (1, 'abc', '1998-01-12');

insert into t1 values (1, 'abc', '1998-01-13');

insert into t1 values (1, 'abc', '1998-01-14');

insert into t1 values (1, 'abc', '1998-01-15');

insert into t1 values (1, 'abc', '1999-01-01');

insert into t1 values (1, 'abc', '1999-01-02');

insert into t1 values (1, 'abc', '1999-01-03');

insert into t1 values (1, 'abc', '1999-01-04');

insert into t1 values (1, 'abc', '1999-01-05');

insert into t1 values (1, 'abc', '1999-01-06');

insert into t1 values (1, 'abc', '1999-01-07');

insert into t1 values (1, 'abc', '1999-01-08');

insert into t1 values (1, 'abc', '1999-01-09');

insert into t1 values (1, 'abc', '1999-01-10');

insert into t1 values (1, 'abc', '1999-01-11');

insert into t1 values (1, 'abc', '1999-01-12');

insert into t1 values (1, 'abc', '1999-01-13');

insert into t1 values (1, 'abc', '1999-01-14');

insert into t1 values (1, 'abc', '1999-01-15');

insert into t1 values (1, 'abc', '2000-01-01');

insert into t1 values (1, 'abc', '2000-01-02');

insert into t1 values (1, 'abc', '2000-01-03');

insert into t1 values (1, 'abc', '2000-01-04');

insert into t1 values (1, 'abc', '2000-01-05');

insert into t1 values (1, 'abc', '2000-01-06');

insert into t1 values (1, 'abc', '2000-01-07');

insert into t1 values (1, 'abc', '2000-01-08');

insert into t1 values (1, 'abc', '2000-01-09');

insert into t1 values (1, 'abc', '2000-01-15');

insert into t1 values (1, 'abc', '2000-01-11');

insert into t1 values (1, 'abc', '2000-01-12');

insert into t1 values (1, 'abc', '2000-01-13');

insert into t1 values (1, 'abc', '2000-01-14');

insert into t1 values (1, 'abc', '2000-01-15');

insert into t1 values (1, 'abc', '2001-01-01');

insert into t1 values (1, 'abc', '2001-01-02');

insert into t1 values (1, 'abc', '2001-01-03');

insert into t1 values (1, 'abc', '2001-01-04');

insert into t1 values (1, 'abc', '2001-01-05');

insert into t1 values (1, 'abc', '2001-01-06');

insert into t1 values (1, 'abc', '2001-01-07');

insert into t1 values (1, 'abc', '2001-01-08');

insert into t1 values (1, 'abc', '2001-01-09');

insert into t1 values (1, 'abc', '2001-01-15');

insert into t1 values (1, 'abc', '2001-01-11');

insert into t1 values (1, 'abc', '2001-01-12');

insert into t1 values (1, 'abc', '2001-01-13');

insert into t1 values (1, 'abc', '2001-01-14');

insert into t1 values (1, 'abc', '2001-01-15');

alter table t1

partition by range (year(c))

(partition p5 values less than (2000), partition p10 values less than (2010));

alter table t1

reorganize partition p5 into

(partition p1 values less than (1996),

partition p2 values less than (1997),

partition p3 values less than (1998),

partition p4 values less than (1999),

partition p5 values less than (2000));

drop table t1;

mysql-test/t/partition.test

+16 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,22 @@ show create table t1; 
set session sql_mode='';

drop table t1;



#

# BUG 19122 Crash after ALTER TABLE t1 REBUILD PARTITION p1

#

create table t1 (a int)

partition by key (a)

(partition p1 engine = innodb);



alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

alter table t1 rebuild partition p1;

drop table t1;



#

# BUG 19304 Partitions: MERGE handler not allowed in partitioned tables

#

mysql-test/t/partition_innodb.test

0 → 100644
+68 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc



SET @max_row = 20;

let $engine= 'InnoDB';

let $MAX_VALUE= (2147483646);



let $max_row= `SELECT @max_row`;



# Column list with definition for all tables to be checked

let $column_list= f_int1 INTEGER,

f_int2 INTEGER,

f_char1 CHAR(20),

f_char2 CHAR(20),

f_charbig VARCHAR(1000);



let $sub_part_no= 3;

--disable_warnings

DROP TABLE IF EXISTS t0_template;

--enable_warnings

eval CREATE TABLE t0_template (

$column_list ,

PRIMARY KEY(f_int1))

ENGINE = MEMORY;

let $num= `SELECT @max_row`;

while ($num)

{

  eval INSERT INTO t0_template

SET f_int1 = $num, f_int2 = $num, f_char1 = '$num', f_char2 = '$num',

f_charbig = '===$num===';

  dec $num;

}

# 1.   Create the table

--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings

eval CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30)) engine=$engine;

# 2.   Fill the table t1 with records

INSERT INTO t1 (f_date, f_varchar)

SELECT CONCAT(CAST((f_int1 + 999) AS CHAR),'-02-10'), CAST(f_char1 AS CHAR)

FROM t0_template

WHERE f_int1 + 999 BETWEEN 1000 AND 9999;

# 3.   Calculate the number of inserted records.

SELECT IF(9999 - 1000 + 1 > @max_row, @max_row , 9999 - 1000 + 1)

       INTO @exp_row_count;

# DEBUG SELECT @exp_row_count;

# 4.   Print the layout, check Readability

ALTER TABLE t1 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));

--echo #  1.1.5 Add two named partitions + test

ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);

drop table t1;



CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30))

ENGINE=InnoDB

PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));



--echo # This statement crashes the server.

--echo #   CREATE partitioned table with three partitions in one step

--echo #   would be harmless.

ALTER TABLE t1 ADD PARTITION PARTITIONS 1;



--disable_warnings

DROP VIEW  IF EXISTS v1;

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t0_aux;

DROP TABLE IF EXISTS t0_definition;

DROP TABLE IF EXISTS t0_template;

--enable_warnings