bk commit into 4.1 tree (jonas:1.2540) BUG#18475

[jonas]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-07 09:41:39+02:00, jonas@stripped +1 -0
  ndb - bug#18475
    Fix error message on copyfragref

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2006-08-07 09:41:38+02:00,
jonas@stripped +4 -5
    Fix error message

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.16/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-08-07 09:41:42 +02:00
+++ 1.17/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2006-08-07 09:41:42 +02:00
@@ -177,13 +177,12 @@
 	     "the state of a fragment scan was out of sync.",     
 	     killingNode);
     break;
-
+    
   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: