Commit e84b4600 authored by unknown's avatar unknown
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 

into  mysql.com:/home/hf/work/mysql-5.1-mrg
parents 2afe42d3 cc13bfc6

mysql-test/r/partition.result

+10 −0
Original line number Diff line number Diff line
@@ -1128,4 +1128,14 @@ a 
18446744073709551613

18446744073709551614

drop table t1;

CREATE TABLE t1 (

num int(11) NOT NULL, cs int(11) NOT NULL)

PARTITION BY RANGE (num) SUBPARTITION BY HASH (

cs) SUBPARTITIONS 2 (PARTITION p_X VALUES LESS THAN MAXVALUE);

ALTER TABLE t1 

REORGANIZE PARTITION p_X INTO ( 

PARTITION p_100 VALUES LESS THAN (100), 

PARTITION p_X VALUES LESS THAN MAXVALUE 

);

drop table t1;

End of 5.1 tests

mysql-test/r/partition_federated.result

0 → 100644
+6 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (s1 int) engine=federated

connection='mysql://root@localhost/federated/t1' partition by list (s1)

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

ERROR HY000: Engine cannot be used in partitioned tables

End of 5.1 tests

mysql-test/t/partition.test

+16 −0
Original line number Diff line number Diff line
@@ -1354,4 +1354,20 @@ delete from t1 where a = 18446744073709551615; 
select * from t1;

drop table t1;



#

# Bug 24502 reorganize partition closes connection

#

CREATE TABLE t1 (

  num int(11) NOT NULL, cs int(11) NOT NULL)

PARTITION BY RANGE (num) SUBPARTITION BY HASH (

cs) SUBPARTITIONS 2 (PARTITION p_X VALUES LESS THAN MAXVALUE);



ALTER TABLE t1 

REORGANIZE PARTITION p_X INTO ( 

    PARTITION p_100 VALUES LESS THAN (100), 

    PARTITION p_X VALUES LESS THAN MAXVALUE 

    );



drop table t1;



--echo End of 5.1 tests

mysql-test/t/partition_federated.test

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#

# Tests for partitioned FEDERATED

#

-- source include/have_partition.inc

-- source include/not_embedded.inc

-- source include/have_federated_db.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Bug #22451 Partitions: duplicate results with engine=federated 

#



--error ER_PARTITION_MERGE_ERROR

create table t1 (s1 int) engine=federated

connection='mysql://root@localhost/federated/t1' partition by list (s1)

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



--echo End of 5.1 tests

sql/sql_partition.cc

+1 −0
Original line number Diff line number Diff line
@@ -4738,6 +4738,7 @@ state of p1. 
      }

      alt_part_info->part_type= tab_part_info->part_type;

      alt_part_info->subpart_type= tab_part_info->subpart_type;

      alt_part_info->no_subparts= tab_part_info->no_subparts;

      DBUG_ASSERT(!alt_part_info->use_default_partitions);

      if (alt_part_info->set_up_defaults_for_partitioning(table->file,

                                                          ULL(0),