Merge perch.ndb.mysql.com:/home/jonas/src/41-work

into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge

Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge
78ead1fe · unknown · b50642e8 · f4e01cf6 · 78ead1fe
Commit 78ead1fe authored Aug 07, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp +3 -4

No files found.
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -181,10 +181,9 @@ void Ndbcntr::execSYSTEM_ERROR(Signal* signal)
  case SystemError::CopyFragRefError:
    BaseString::snprintf(buf, sizeof(buf), 
-	     "Node %d killed this node because "
+			 "Killed by node %d as "
-	     "it could not copy a fragment during node restart. "
+			 "copyfrag failed, error: %u",
-	     "Copy fragment error code: %u.",
+			 killingNode, data1);
-	     killingNode, data1);
    break;
  default: