From: magnus.blaudd
Date: June 13 2011 6:13am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3442)
List-Archive: http://lists.mysql.com/commits/139127
Message-Id: <20110613061342.CB0DB13402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6822319692240355346=="

--===============6822319692240355346==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/msvensson/mysql/6.3/ based on revid:jonas@stripped

 3442 magnus.blaudd@stripped	2011-06-13
      ndb
       - fix speclling error in error message, Hearbeat -> Heartbeat

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-05-30 11:52:38 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-06-13 06:13:11 +0000
@@ -3562,7 +3562,7 @@ void Qmgr::failReportLab(Signal* signal,
       msg = "Start timeout";
       break;
     case FailRep::ZHEARTBEAT_FAILURE:
-      msg = "Hearbeat failure";
+      msg = "Heartbeat failure";
       break;
     case FailRep::ZLINK_FAILURE:
       msg = "Connection failure";


--===============6822319692240355346==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   bzfydbpax1xz36i0
# target_branch: file:///home/msvensson/mysql/6.3/
# testament_sha1: 09e832c708a0c37ab66fa1e42cb71e6a2344478b
# timestamp: 2011-06-13 08:13:42 +0200
# source_branch: file:///home/msvensson/mysql/6.2/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXHtyuwAAWxfgBAQUGf//1JC
IAC////wUAOFlvY9uFT3VnhkU1NMGk8lPNNTI0RtQMmgaDQMkmIyME0ptQ09R6gAA00BhJI0hqn4
oQPU0aaPSAAAAwyVMZGUwE00Bo0GTQAABJJE2Qp7KaT01MTyCMjQBoDQtEYJ66mCwO7kEK4NAHTT
Cdl7Fm1FcaVnszoREHtyOhmmlUR8iLxjcs83nhz68ugeiHqgv1dODzeWrGQhNbFq0jeCINLNgNar
3ZbhlaJYq+yfoChOBgl1l2ugdaCintFsV3uoCOKJc5mGJmwe5kDCZUMouh1lhfGlRQFUrLV4SERW
8ap2E6RF4Fmi2fQKbC8y43mp0eqEa+dx0g0Pe5U9mLBi8ag3vCbRegIYI6BllcYa6JUA2a2mUVYt
8UwnIKUqKj/A/mWds1gdi4M/EGbTFiMHDlSVm2pt24MB5REIECfZpOajCI4cUVx0aYYcbLHc8+Vh
RUxYAU1ttQXXoK31nK1qCsweQ0fI54zksPElVRYEaNN+1X+ZOYgCnCi8p8zhdhhAWhpcMpdedAuM
BgMxHoLY0xQMnS9GyAUpSgjUKNRYuAUtI+AmtiYlkpX2l2AOkqYgRE83mh+xKGwq0IQ0XTmtwaNt
F5xsSmpHI3pYfjjslGjxkVVoYoBiDMPJYD3X7UEqG142iutOGZPWYHPUMgcgMODoNzzkH8scGJ8q
TfYSHIZaS4aO927bhgK/DFwaYigwqZvE5lJkiEgOYNQUmFm4T178fZQBcEdXcJJGDQ0cIt7bQs+k
hc+poMr2tEWbqUdxjI3YiPUMfaORQ2jFi5evEW41GkIJ1xaNHZfMVbi8fl6D90PLmN5cK6faJSLQ
7U8SgTaMttR7wYCiF4r8PEpLcLzZILQpxAbv/Y2suAyDN0TQz5lhwVQaS5GMDQT9XINIWBW+ZGpL
XBJuQzZNHEvoc/I/HMI1+57DZy9HAvJQ2UVmf+YuwfB5zqY/4UL2TKrBhrcJ65Tc4OeizIdl5JQT
5aXMOQ5QCsCAC14CYnaBC03OGOxw06jTQiHSC6HVqkMt8JBjYxKkzTwvAYhEFZ8KQRTZnJ1sqFFU
loujnDovhF1FDETU8AxkgfknSdIsQCLNtdaUcwFNMBOCkDM30Szju+NZthe+opCoJmVtvSQSsMXq
FdKWpMsoU7N5PKNgqlkILE8haoqMhRDjaLcaYywEWDFvAXckU4UJBx7crsA=


--===============6822319692240355346==--