bk commit into 6.0 tree (hakank:1.2547)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank 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-02-25 22:35:21+01:00, hakank@lu0011.(none) +1 -0
  After merge fix.

  sql/share/errmsg.txt@stripped, 2008-02-25 22:35:16+01:00, hakank@lu0011.(none) +2 -0
    After merge fix.

diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt	2008-02-25 22:07:51 +01:00
+++ b/sql/share/errmsg.txt	2008-02-25 22:35:16 +01:00
@@ -6232,5 +6232,7 @@ ER_TABLESPACE_EXIST
   eng "Tablespace '%-.192s' already exists"
 ER_NO_SUCH_TABLESPACE
   eng "Tablespace '%-.192s' doesn't exist"
+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"