bzr commit into mysql-trunk branch (jorgen.loland:3693) Bug#11762751 Bug#11764529

[Jorgen Loland]

#At file:///export/home/jl208045/mysql/mysql-trunk-55385/ based on revid:jorgen.loland@stripped

 3693 Jorgen Loland	2011-02-21 [merge]
      BUG#11762751 and BUG#11764529 should have been pushed to 5.5.
      
      Null-merging already pushed CS, but error message is moved in
      errmsg-utf8 to same location as in 5.5 to maintain consistant 
      error numbers.
     @ sql/share/errmsg-utf8.txt
        New error message for multi-table update where the same table is updated multiple times.

    modified:
      sql/share/errmsg-utf8.txt
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-02-21 15:31:41 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-02-21 15:55:58 +0000
@@ -6452,6 +6452,10 @@ ER_BINLOG_READ_EVENT_CHECKSUM_FAILURE
 
 ER_STMT_CACHE_FULL  
         eng "Multi-row statements required more than 'max_binlog_stmt_cache_size' bytes of storage; increase this mysqld variable and try again"
+
+ER_MULTI_UPDATE_KEY_CONFLICT
+  eng "Primary key/partition key update is not allowed since the table is updated both as '%-.192s' and '%-.192s'."
+
 ER_BINLOG_STMT_CACHE_SIZE_GREATER_THAN_MAX
   eng "Option binlog_stmt_cache_size (%lu) is greater than max_binlog_stmt_cache_size (%lu); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size."
 
@@ -6483,6 +6487,3 @@ ER_NO_SUCH_PARTITION 
   slo "Partition '%-.64s' doesn't exist"
   spa "Particion '%-.64s' no existe"
   swe "Det finns ingen partition som heter '%-.64s'"
-
-ER_MULTI_UPDATE_KEY_CONFLICT
-  eng "Primary key/partition key update is not allowed since the table is updated both as '%-.192s' and '%-.192s'."

No bundle (reason: revision is a merge).