bzr commit into mysql-5.1-bugteam branch (msvensson:2809) Bug#43215

[Magnus Svensson]

#At file:///home/msvensson/mysql/5.1-bugteam/ based on revid:anurag.shekhar@stripped

 2809 Magnus Svensson	2009-02-26
      Bug#43215 6 error codes changed from 5.1 to 6.0
      modified:
        sql/share/errmsg.txt

per-file messages:
  sql/share/errmsg.txt
    - Reserve released error codes in 5.1
=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-02-18 20:10:19 +0000
+++ b/sql/share/errmsg.txt	2009-02-26 14:01:57 +0000
@@ -6154,3 +6154,18 @@ WARN_PLUGIN_BUSY
 
 ER_VARIABLE_IS_READONLY
   eng "%s variable '%s' is read-only. Use SET %s to assign the value"
+
+ER_WARN_ENGINE_TRANSACTION_ROLLBACK
+  eng "Storage engine %s does not support rollback for this statement. Transaction rolled back and must be restarted"
+
+ER_SLAVE_HEARTBEAT_FAILURE
+  eng "Unexpected master's heartbeat data: %s"
+ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
+  eng "The requested value for the heartbeat period %s %s"
+
+ER_NDB_REPLICATION_SCHEMA_ERROR
+        eng "Bad schema for mysql.ndb_replication table. Message: %-.64s"
+ER_CONFLICT_FN_PARSE_ERROR
+        eng "Error in parsing conflict function. Message: %-.64s"
+ER_EXCEPTIONS_WRITE_ERROR
+        eng "Write to exceptions table failed. Message: %-.128s""