bk commit into 5.1 tree (reggie:1.2165)

[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.2165 06/02/22 14:18:45 reggie@stripped +1 -0
  Merge rburnett@stripped:/home/bk/mysql-5.1-new
  into  linux.site:/home/reggie/work/mysql-5.1

  sql/share/errmsg.txt
    1.86 06/02/22 14:18:37 reggie@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.85/sql/share/errmsg.txt	2006-02-22 05:04:17 -06:00
+++ 1.86/sql/share/errmsg.txt	2006-02-22 14:18:37 -06:00
@@ -5660,8 +5660,8 @@
         eng "For the partitioned engine it is necessary to define all %-.64s"
         swe "För partitioneringsmotorn så är det nödvändigt att definiera alla %-.64s"
 ER_TOO_MANY_PARTITIONS_ERROR
-        eng "Too many partitions were defined"
-        swe "För många partitioner definierades"
+        eng "Too many partitions (including subpartitions) were defined"
+        swe "För många partitioner (inkluderande subpartitioner) definierades"
 ER_SUBPARTITION_ERROR
         eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY
partitioning for subpartitioning"
         swe "Det är endast möjligt att blanda RANGE/LIST partitionering med HASH/KEY
partitionering för subpartitionering"