bzr commit into mysql-5.1-telco-6.4 branch (msvensson:2883)

[Magnus Svensson]

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

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

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2009-02-18 15:01:04 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2009-02-23 11:23:39 +0000
@@ -3049,7 +3049,7 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
 		       *nodeId, type, (long) client_addr));
   if (m_opts.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);
@@ -3078,8 +3078,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;