Commit 0812a1f0 authored by unknown's avatar unknown
Browse files

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

into  dator5.(none):/home/pappa/bug21210


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
parents 86b4ca84 24f9f35e

mysql-test/r/partition.result

+0 −37
Original line number Diff line number Diff line
@@ -21,32 +21,6 @@ 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 key (a)

(partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');

ERROR 42000: Incorrect table name 'part-data'
@@ -1042,17 +1016,6 @@ set session sql_mode=''; 
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_error.result

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

create table t1 (a int)

engine = x

partition by key (a);

Warnings:

Error	1286	Unknown table engine 'x'

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

drop table t1;

create table t1 (a int)

engine = innodb

partition by list (a)

(partition p0 values in (0));

alter table t1 engine = x;

Warnings:

Error	1286	Unknown table engine 'x'

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

drop table t1;

partition by list (a)

partitions 3

(partition x1 values in (1,2,9,4) tablespace ts1,

mysql-test/r/partition_innodb.result

+71 −0
Original line number Diff line number Diff line
@@ -3,3 +3,74 @@ show table status like 't1'; 
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	

drop table t1;

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

engine = x

partition by key (a);

Warnings:

Error	1286	Unknown table engine 'x'

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

drop table t1;

create table t1 (a int)

engine = innodb

partition by list (a)

(partition p0 values in (0));

alter table t1 engine = x;

Warnings:

Error	1286	Unknown table engine 'x'

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

drop table t1;

mysql-test/r/partition_range.result

+0 −10
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-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--symbolic-links=1