Commit c71dd8c1 authored by unknown's avatar unknown
Browse files

Manual merge

parent 66369378

mysql-test/r/partition.result

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ alter table t1 add partition (partition p1 values less than (2)); 
ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition definition

alter table t1 add partition (partition p1 values in (2));

ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));

alter table t1 rebuild partition;

sql/sql_partition.cc

+2 −1
Original line number Diff line number Diff line
@@ -4135,7 +4135,8 @@ uint prep_alter_part_table(THD *thd, TABLE *table, ALTER_INFO *alter_info, 
                        *fast_alter_partition, flags));

    if (((alter_info->flags & ALTER_ADD_PARTITION) ||

         (alter_info->flags & ALTER_REORGANIZE_PARTITION)) &&

         (thd->lex->part_info->part_type != tab_part_info->part_type))

         (thd->lex->part_info->part_type != tab_part_info->part_type) &&

         (thd->lex->part_info->part_type != NOT_A_PARTITION))

    {

      if (thd->lex->part_info->part_type == RANGE_PARTITION)

      {