summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-08-07 09:49:46 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-08-07 09:49:46 +0200
commit78ead1feb29e9b87796a45a7b8272f18af144919 (patch)
treee3641583a8584af9cffd06a0d1f78ed5aac71c4a /ndb
parentb50642e89982bd2957f438e2bdce272478fbc065 (diff)
parentf4e01cf6a13f0a06566355c451f8bfb313b824f6 (diff)
downloadmariadb-git-78ead1feb29e9b87796a45a7b8272f18af144919.tar.gz
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
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index e6bb4d4f14f..e351683c78c 100644
--- 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 "
- "it could not copy a fragment during node restart. "
- "Copy fragment error code: %u.",
- killingNode, data1);
+ "Killed by node %d as "
+ "copyfrag failed, error: %u",
+ killingNode, data1);
break;
default: