Commit 60d5f457 authored by unknown's avatar unknown
Browse files

BUG#15961: After review fixes 

New error message


sql/share/errmsg.txt:
  New error message
sql/sql_partition.cc:
  New error message
parent 29cd6ff6

sql/share/errmsg.txt

+4 −0
Original line number Diff line number Diff line
@@ -5614,6 +5614,10 @@ ER_PARTITION_MAXVALUE_ERROR 
ER_PARTITION_SUBPARTITION_ERROR

        eng "Subpartitions can only be hash partitions and by key"

        swe "Subpartitioner kan bara vara hash och key partitioner"

ER_PARTITION_SUBPART_MIX_ERROR

        eng "Must define subpartitions on all partitions if on one partition"

        swe "Subpartitioner måste definieras på alla partitioner om på en"



ER_PARTITION_WRONG_NO_PART_ERROR

        eng "Wrong number of partitions defined, mismatch with previous setting"

        swe "Antal partitioner definierade och antal partitioner r inte lika"

sql/sql_partition.cc

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type, 
                 part_info->part_type == LIST_PARTITION))))

  {

    /* Only RANGE and LIST partitioning can be subpartitioned */

    my_error(ER_SUBPARTITION_ERROR, MYF(0));

    my_error(ER_PARTITION_SUBPART_MIX_ERROR, MYF(0));

    goto end;

  }

  if (unlikely(part_info->set_up_defaults_for_partitioning(file,