Commit c8e4fe09 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
parents 72df0b3e ab72c347

mysql-test/r/ndb_partition_key.result

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ drop table t1; 
CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))

ENGINE = NDB

PARTITION BY KEY (c);

ERROR HY000: A PRIMARY KEY need to include all fields in the partition function

ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function

CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))

ENGINE = NDB

PARTITION BY KEY (a);

mysql-test/r/partition.result

+85 −6
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (s1 char(2) character set utf8)

partition by list (case when s1 > 'cz' then 1 else 2 end)

(partition p1 values in (1),

partition p2 values in (2));

drop table 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 key (a)

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

ERROR 42000: Incorrect table name 'part-data'

create table t1 (a int)

partition by key (a)

(partition p0,

partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');

ERROR 42000: Incorrect table name 'part-data'

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));
@@ -731,7 +787,7 @@ ERROR HY000: Cannot create temporary table with partitions 
create table t1 (a int, b int) partition by list (a)

(partition p1 values in (1), partition p2 values in (2));

alter table t1 add primary key (b);

ERROR HY000: A PRIMARY KEY need to include all fields in the partition function

ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -750,11 +806,6 @@ t2 CREATE TABLE `t2` ( 
  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' /*!50100 PARTITION BY KEY (a)  */

drop table t2;

create table t1 (s1 char(2) character set utf8)

partition by list (case when s1 > 'cz' then 1 else 2 end)

(partition p1 values in (1),

partition p2 values in (2));

drop table t1;

create table t1 (f1 int) partition by hash (f1) as select 1;

drop table t1;

prepare stmt1 from 'create table t1 (s1 int) partition by hash (s1)';
@@ -1117,4 +1168,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/disabled.def

+4 −2
Original line number Diff line number Diff line
@@ -13,14 +13,13 @@ 
#events_stress            : BUG#17619 2006-02-21 andrey  Race conditions

#events                   : BUG#17619 2006-02-21 andrey  Race conditions

#events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.

#im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly

im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly

im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_instance_conf fails randomly

#im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails

ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

#ndb_binlog_ignore_db     : BUG#21279 2006-07-25 ingo    Randomly throws a warning

ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

partition                : BUG#21658 2006-08-16 Partition test fails, --ps-protocol

partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

ps                       : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in --ps-protocol test AMD64 bit

ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
@@ -44,5 +43,8 @@ rpl_sp_effects : BUG#19862 2006-06-15 mkindahl 
#rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson

crash_commit_before      : 2006-08-02 msvensson

rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)

func_group               : BUG#21924 2006-08-30 reggie

func_in                  : BUG#21925 2006-08-30 reggie

partition_mgm_err2       : BUG#19107 2006-08-30 reggie

ndb_binlog_discover      : bug#21806 2006-08-24

ndb_autodiscover3        : bug#21806