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

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

@@ -181,9 +181,8 @@ void Ndbcntr::execSYSTEM_ERROR(Signal* signal)
 
   case SystemError::CopyFragRefError:
     BaseString::snprintf(buf, sizeof(buf), 
-	     "Node %d killed this node because "
-	     "it could not copy a fragment during node restart. "
-	     "Copy fragment error code: %u.",
+			 "Killed by node %d as "
+			 "copyfrag failed, error: %u",
 			 killingNode, data1);
     break;