bk commit into 5.1 tree (reggie:1.2164) BUG#17393

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of reggie. When reggie 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.2164 06/02/22 12:46:30 reggie@stripped +2 -0
  BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions
  
  We changed the error message to more clearly reflect the fact
  that we are counting parts and subparts

  sql/share/errmsg.txt
    1.85 06/02/22 12:46:21 reggie@stripped +2 -2
    updated error message

  mysql-test/r/partition_mgm_err.result
    1.11 06/02/22 12:46:21 reggie@stripped +1 -1
    updated 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/work/mysql-5.1

--- 1.84/sql/share/errmsg.txt	2006-02-20 13:51:26 -06:00
+++ 1.85/sql/share/errmsg.txt	2006-02-22 12:46:21 -06:00
@@ -5660,8 +5660,8 @@
         eng "For the partitioned engine it is necessary to define all %-.64s"
 ER_TOO_MANY_PARTITIONS_ERROR
-        eng "Too many partitions were defined"
+        eng "Too many partitions (including subpartitions) were defined"
 ER_SUBPARTITION_ERROR
         eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning"

--- 1.10/mysql-test/r/partition_mgm_err.result	2006-02-21 17:39:56 -06:00
+++ 1.11/mysql-test/r/partition_mgm_err.result	2006-02-22 12:46:21 -06:00
@@ -91,7 +91,7 @@
 ALTER TABLE t1 ADD PARTITION PARTITIONS 0;
 ERROR HY000: At least one partition must be added
 ALTER TABLE t1 ADD PARTITION PARTITIONS 1024;
-ERROR HY000: Too many partitions were defined
+ERROR HY000: Too many partitions (including subpartitions) were defined
 ALTER TABLE t1 DROP PARTITION x0;
 ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions
 ALTER TABLE t1 COALESCE PARTITION 1;