bk commit into 5.1 tree (mkindahl:1.2561)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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@stripped, 2008-04-01 18:50:35+02:00, mkindahl@stripped +1 -0
  Post-merge fixes.

  sql/share/errmsg.txt@stripped, 2008-04-01 18:50:29+02:00, mkindahl@stripped +2 -2
    Reverting error message to before merge.

diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt	2008-04-01 11:54:21 +02:00
+++ b/sql/share/errmsg.txt	2008-04-01 18:50:29 +02:00
@@ -5522,8 +5522,8 @@ ER_M_BIGGER_THAN_D 42000 S1009
         eng "For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.192s')."
 ER_WRONG_LOCK_OF_SYSTEM_TABLE
-        eng "You can't combine write-locking of system '%-.64s.%-.64s' table with other tables"
+        eng "You can't combine write-locking of system tables with other tables or lock types"
 ER_CONNECT_TO_FOREIGN_DATA_SOURCE
         eng "Unable to connect to foreign data source: %.64s"
         ger "Kann nicht mit Fremddatenquelle verbinden: %.64s"