bzr push into mysql-5.1-telco-6.2 branch (msvensson:2854 to 2855)

[Magnus Svensson]

 2855 Magnus Svensson	2009-02-23 [merge]
      Merge
      modified:
        storage/ndb/src/mgmsrv/MgmtSrvr.cpp

 2854 Jonas Oreland	2009-02-23
      ndb - bug#43021 - mlockall can cause watchdog failure. 1) inform watchdog that we're calling mlockall (refresh_watchdog) 2) move setting of real watchdog interval to after mlockall
      modified:
        storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
        storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2009-02-18 14:29:58 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2009-02-23 10:44:03 +0000
@@ -2464,7 +2464,7 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
 
   if (g_no_nodeid_checks) {
     if (*nodeId == 0) {
-      error_string.appfmt("no-nodeid-checks set in management server.\n"
+      error_string.appfmt("no-nodeid-checks set in management server. "
 			  "node id must be set explicitly in connectstring");
       error_code = NDB_MGM_ALLOCID_CONFIG_MISMATCH;
       DBUG_RETURN(false);
@@ -2493,8 +2493,8 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
   if (type == NDB_MGM_NODE_TYPE_MGM && nodes_info.size() > 1)
   {
     // mgmt server may only have one match
-    error_string.appfmt("Ambiguous node id's %d and %d.\n"
-                        "Suggest specifying node id in connectstring,\n"
+    error_string.appfmt("Ambiguous node id's %d and %d. "
+                        "Suggest specifying node id in connectstring, "
                         "or specifying unique host names in config file.",
                         nodes_info[0].id, nodes_info[1].id);
     error_code= NDB_MGM_ALLOCID_CONFIG_MISMATCH;