bzr push into mysql-5.1-telco-6.3 branch (magnus.blaudd:3441 to 3442)

[magnus.blaudd]

 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
 3441 jonas oreland	2011-06-01
      ndb - bug#12598398 - improve error message for "Failed to convert connection"

    modified:
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.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";

No bundle (reason: useless for push emails).