Commit e6170de4 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/r/partition_error.result:
  manual merge
mysql-test/r/partition_range.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/partition_error.test:
  manual merge
mysql-test/t/partition_range.test:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/partition_element.h:
  manual merge
sql/partition_info.cc:
  manual merge
sql/partition_info.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_partition.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/table.cc:
  manual merge
parents 2ecd916d 6e9bdcc9

mysql-test/r/partition.result

+38 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a bigint)

partition by range (a)

(partition p0 values less than (0xFFFFFFFFFFFFFFFF),

partition p1 values less than (10));

ERROR 42000: VALUES value must be of same type as partition function near '),

partition p1 values less than (10))' at line 3

create table t1 (a bigint)

partition by list (a)

(partition p0 values in (0xFFFFFFFFFFFFFFFF),

partition p1 values in (10));

ERROR 42000: VALUES value must be of same type as partition function near '),

partition p1 values in (10))' at line 3

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (100),

partition p1 values less than MAXVALUE);

insert into t1 values (1);

drop table t1;

create table t1 (a bigint unsigned)

partition by hash (a);

insert into t1 values (0xFFFFFFFFFFFFFFFD);

insert into t1 values (0xFFFFFFFFFFFFFFFE);

select * from t1 where (a + 1) < 10;

a

select * from t1 where (a + 1) > 10;

a

18446744073709551613

18446744073709551614

create table t1 (a int)

engine = csv

partition by list (a)
@@ -865,6 +893,16 @@ SHOW TABLE STATUS; 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	0	0	0	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

DROP TABLE t1;

create table t1 (a bigint unsigned)

partition by list (a)

(partition p0 values in (0-1));

ERROR HY000: Partition constant is out of partition function domain

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (10));

insert into t1 values (0xFFFFFFFFFFFFFFFF);

ERROR HY000: Table has no partition for value 18446744073709551615

drop table t1;

create table t1 (a int)

partition by list (a)

(partition `s1 s2` values in (0));

mysql-test/r/partition_error.result

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,10 @@ PARTITION BY RANGE (a) (PARTITION p1 VALUES LESS THAN(5)); 
insert into t1 values (10);

ERROR HY000: Table has no partition for value 10

drop table t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (-1));

ERROR HY000: Partition constant is out of partition function domain

create table t1 (v varchar(12))

partition by range (ascii(v))

(partition p0 values less than (10));

mysql-test/r/partition_range.result

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

10

DROP TABLE t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (10),

partition p1 values less than (0));

ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (0),

partition p1 values less than (10));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

drop table t1;

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (2),

partition p1 values less than (10));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(20) unsigned DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)

insert into t1 values (0xFFFFFFFFFFFFFFFF);

ERROR HY000: Table has no partition for value 18446744073709551615

create table t1 (a int)

partition by range (MOD(a,3))

subpartition by hash(a)

mysql-test/t/partition.test

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

--enable_warnings



#

# BUG 16002: Handle unsigned integer functions properly

#

--error 1064

create table t1 (a bigint)

partition by range (a)

(partition p0 values less than (0xFFFFFFFFFFFFFFFF),

 partition p1 values less than (10));

--error 1064

create table t1 (a bigint)

partition by list (a)

(partition p0 values in (0xFFFFFFFFFFFFFFFF),

 partition p1 values in (10));



create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (100),

 partition p1 values less than MAXVALUE);

insert into t1 values (1);

drop table t1;



create table t1 (a bigint unsigned)

partition by hash (a);

insert into t1 values (0xFFFFFFFFFFFFFFFD);

insert into t1 values (0xFFFFFFFFFFFFFFFE);

select * from t1 where (a + 1) < 10;

select * from t1 where (a + 1) > 10;



#

# Bug 19307: CSV engine crashes

#
@@ -19,6 +47,7 @@ partition by list (a) 
(partition p0 values in (null));



#

# Added test case

#

create table t1 (a int)

partition by key(a)
@@ -985,6 +1014,23 @@ PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM); 
SHOW TABLE STATUS;

DROP TABLE t1;



#

#BUG 16002 Erroneus handling of unsigned partition functions

#

--error ER_PARTITION_CONST_DOMAIN_ERROR

create table t1 (a bigint unsigned)

partition by list (a)

(partition p0 values in (0-1));



create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (10));



--error ER_NO_PARTITION_FOR_GIVEN_VALUE

insert into t1 values (0xFFFFFFFFFFFFFFFF);



drop table t1;



#

#BUG 18750 Problems with partition names

#

mysql-test/t/partition_error.test

+4 −0
Original line number Diff line number Diff line
@@ -748,6 +748,10 @@ CREATE TABLE t1(a int) 
insert into t1 values (10);

drop table t1;



--error ER_PARTITION_CONST_DOMAIN_ERROR

create table t1 (a bigint unsigned)

partition by range (a)

(partition p0 values less than (-1));

#

# Bug 18198 Partitions: Verify that erroneus partition functions doesn't work

#