Commit 0f20d17e authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 

into  dator5.(none):/home/pappa/bug21388
parents a8d8ebed 0aab7b87

mysql-test/r/partition.result

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

create table t1 (a int)

partition by key(a)

partitions 0.2+e1;

ERROR 42000: Only normal integers allowed as number here near '0.2+e1' at line 3

create table t1 (a int)

partition by key(a)

partitions -1;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 3

create table t1 (a int)

partition by key(a)

partitions 1.5;

ERROR 42000: Only normal integers allowed as number here near '1.5' at line 3

create table t1 (a int)

partition by key(a)

partitions 1e+300;

ERROR 42000: Only normal integers allowed as number here near '1e+300' at line 3

create table t1 (a int)

engine = innodb

partition by key (a);

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	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (0), (1), (2), (3);

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	InnoDB	10	Compact	4	4096	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

drop table t1;

create table t1 (a int auto_increment primary key)

engine = innodb

partition by key (a);

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	InnoDB	10	Compact	2	8192	16384	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (NULL), (NULL), (NULL), (NULL);

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	InnoDB	10	Compact	4	4096	16384	0	0	0	5	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

insert into t1 values (NULL), (NULL), (NULL), (NULL);

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	InnoDB	10	Compact	8	2048	16384	0	0	0	9	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));

create procedure pz()
@@ -1117,4 +1159,32 @@ hello/master-data/tmpinx/t1#P#p1#SP#subpart11.MYI 
hello/master-data/tmpinx/t1#P#p2#SP#subpart20.MYI

hello/master-data/tmpinx/t1#P#p2#SP#subpart21.MYI

drop table t1;

create table t1 (a bigint unsigned not null, primary key(a))

engine = myisam

partition by key (a)

partitions 10;

show create table t1;

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

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

(18446744073709551613), (18446744073709551612);

select * from t1;

a

18446744073709551612

18446744073709551613

18446744073709551614

18446744073709551615

select * from t1 where a = 18446744073709551615;

a

18446744073709551615

delete from t1 where a = 18446744073709551615;

select * from t1;

a

18446744073709551612

18446744073709551613

18446744073709551614

drop table t1;

End of 5.1 tests

mysql-test/r/partition_mgm.result

+10 −0
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 (10) (subpartition sp00, subpartition sp01),

partition p1 values less than (20) (subpartition sp10, subpartition sp11));

alter table t1 reorganize partition p0 into

(partition p0 values less than (10) (subpartition sp00,

subpartition sp01, subpartition sp02));

ERROR HY000: Wrong number of subpartitions defined, mismatch with previous setting

drop table t1;

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

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

SHOW CREATE TABLE t1;

mysql-test/r/partition_range.result

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

create table t1 (a date)

engine = innodb

partition by range (year(a))

(partition p0 values less than (2006),

partition p1 values less than (2007));

explain partitions select * from t1

where a between '2006-01-01' and '2007-06-01';

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	2	Using where

drop table t1;

create table t1 (a int unsigned)

partition by range (a)

(partition pnull values less than (0),

mysql-test/t/partition.test

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

--enable_warnings



#

# Bug 15890: Strange number of partitions accepted

#

-- error 1064

create table t1 (a int)

partition by key(a)

partitions 0.2+e1;

-- error 1064

create table t1 (a int)

partition by key(a)

partitions -1;

-- error 1064

create table t1 (a int)

partition by key(a)

partitions 1.5;

-- error 1064

create table t1 (a int)

partition by key(a)

partitions 1e+300;



#

# Bug 21173: SHOW TABLE STATUS crashes server in InnoDB

#

create table t1 (a int)

engine = innodb

partition by key (a);

show table status;

insert into t1 values (0), (1), (2), (3);

show table status;

drop table t1;



create table t1 (a int auto_increment primary key)

engine = innodb

partition by key (a);

show table status;

insert into t1 values (NULL), (NULL), (NULL), (NULL);

show table status;

insert into t1 values (NULL), (NULL), (NULL), (NULL);

show table status;

drop table t1;

>>>>>>>

#

# Bug 19309 Partitions: Crash if double procedural alter

#
@@ -1300,4 +1341,22 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO 
drop table t1;

--exec rmdir $MYSQLTEST_VARDIR/master-data/tmpdata || true

--exec rmdir $MYSQLTEST_VARDIR/master-data/tmpinx || true



#

# Bug 21388: Bigint fails to find record

#

create table t1 (a bigint unsigned not null, primary key(a))

engine = myisam

partition by key (a)

partitions 10;



show create table t1;

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

(18446744073709551613), (18446744073709551612);

select * from t1;

select * from t1 where a = 18446744073709551615;

delete from t1 where a = 18446744073709551615;

select * from t1;

drop table t1;



--echo End of 5.1 tests

mysql-test/t/partition_mgm.test

+17 −0
Original line number Diff line number Diff line
@@ -2,6 +2,23 @@ 
--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



#

# Bug 21143: mysqld hang when error in number of subparts in

#            REORGANIZE command

#

create table t1 (a int)

partition by range (a)

subpartition by key (a)

(partition p0 values less than (10) (subpartition sp00, subpartition sp01),

 partition p1 values less than (20) (subpartition sp10, subpartition sp11));



-- error ER_PARTITION_WRONG_NO_SUBPART_ERROR

alter table t1 reorganize partition p0 into

(partition p0 values less than (10) (subpartition sp00,

subpartition sp01, subpartition sp02));

drop table t1;

 

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

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

SHOW CREATE TABLE t1;