Commit 47ed8cec authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/bug21143 

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


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
parents ffcbf055 2bf914b4

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

sql/ha_partition.cc

+2 −4
Original line number Diff line number Diff line
@@ -5155,13 +5155,12 @@ void ha_partition::print_error(int error, myf errflag) 
  DBUG_ENTER("ha_partition::print_error");



  /* Should probably look for my own errors first */

  /* monty: needs to be called for the last used partition ! */

  DBUG_PRINT("enter", ("error: %d", error));



  if (error == HA_ERR_NO_PARTITION_FOUND)

    m_part_info->print_no_partition_found(table);

  else

    m_file[0]->print_error(error, errflag);

    m_file[m_last_part]->print_error(error, errflag);

  DBUG_VOID_RETURN;

}
@@ -5171,8 +5170,7 @@ bool ha_partition::get_error_message(int error, String *buf) 
  DBUG_ENTER("ha_partition::get_error_message");



  /* Should probably look for my own errors first */

  /* monty: needs to be called for the last used partition ! */

  DBUG_RETURN(m_file[0]->get_error_message(error, buf));

  DBUG_RETURN(m_file[m_last_part]->get_error_message(error, buf));

}

sql/sql_partition.cc

+9 −7
Original line number Diff line number Diff line
@@ -3474,14 +3474,9 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf, 
  }

  table->part_info= part_info;

  table->file->set_part_info(part_info);

  if (part_info->default_engine_type == NULL)

  {

  if (!part_info->default_engine_type)

    part_info->default_engine_type= default_db_type;

  }

  else

  {

  DBUG_ASSERT(part_info->default_engine_type == default_db_type);

  }

  part_info->item_free_list= thd->free_list;



  {
@@ -4395,6 +4390,13 @@ state of p1. 
        my_error(ER_REORG_HASH_ONLY_ON_SAME_NO, MYF(0));

        DBUG_RETURN(TRUE);

      }

      if (tab_part_info->is_sub_partitioned() &&

          alt_part_info->no_subparts &&

          alt_part_info->no_subparts != tab_part_info->no_subparts)

      {

        my_error(ER_PARTITION_WRONG_NO_SUBPART_ERROR, MYF(0));

        DBUG_RETURN(TRUE);

      }

      check_total_partitions= tab_part_info->no_parts + no_parts_new;

      check_total_partitions-= no_parts_reorged;

      if (check_total_partitions > MAX_PARTITIONS)