From: Date: March 14 2006 9:39am
Subject: bk commit into 5.1 tree (mikael:1.2165) BUG#15961
List-Archive: http://lists.mysql.com/commits/3806
X-Bug: 15961
Message-Id: <200603140839.k2E8dKs7017742@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of mikael. When mikael does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2165 06/03/14 00:39:06 mikael@zim.(none) +2 -0
  BUG#15961: After review fixes
  New error message

  sql/sql_partition.cc
    1.46 06/03/14 00:39:00 mikael@zim.(none) +1 -1
    New error message

  sql/share/errmsg.txt
    1.88 06/03/14 00:39:00 mikael@zim.(none) +4 -0
    New error message

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikael
# Host:	zim.(none)
# Root:	/home/mikael/bug15961

--- 1.87/sql/share/errmsg.txt	2006-03-01 12:35:42 -08:00
+++ 1.88/sql/share/errmsg.txt	2006-03-14 00:39:00 -08:00
@@ -5614,6 +5614,10 @@
 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"

--- 1.45/sql/sql_partition.cc	2006-03-11 06:17:04 -08:00
+++ 1.46/sql/sql_partition.cc	2006-03-14 00:39:00 -08:00
@@ -704,7 +704,7 @@
                  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,