bk commit into 4.1 tree (joreland:1.2181) BUG#9969

[jonas.oreland]

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
  1.2181 05/04/22 09:40:44 joreland@stripped +2 -0
  bug#9969 - ndb
    missleading error message

  ndb/test/src/NdbBackup.cpp
    1.21 05/04/22 09:40:40 joreland@stripped +1 -1
    typo

  ndb/src/ndbapi/ndberror.c
    1.23 05/04/22 09:40:40 joreland@stripped +3 -3
    bug#9969 - ndb
      missleading 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:	joreland
# Host:	eel.hemma.oreland.se.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.20/ndb/test/src/NdbBackup.cpp	Fri Apr 22 09:07:23 2005
+++ 1.21/ndb/test/src/NdbBackup.cpp	Fri Apr 22 09:40:40 2005
@@ -244,8 +244,8 @@
 
 int 
 NdbBackup::NF(NdbRestarter& _restarter, int *NFDuringBackup_codes, const int sz, bool
onMaster){
+  int nNodes = _restarter.getNumDbNodes();
   {
-    int nNodes = _restarter.getNumDbNodes();
     if(nNodes == 1)
       return NDBT_OK;
     

--- 1.22/ndb/src/ndbapi/ndberror.c	Fri Apr 22 09:07:23 2005
+++ 1.23/ndb/src/ndbapi/ndberror.c	Fri Apr 22 09:40:40 2005
@@ -140,10 +140,10 @@
   { 4008, UR, "Receive from NDB failed" },
   { 4009, UR, "Cluster Failure" },
   { 4012, UR, 
-   "Time-out, most likely caused by simple read or cluster failure" }, 
+    "Request ndbd time-out, maybe due to high load or communication problems"}, 
   { 4024, UR, 
-   "Time-out, most likely caused by simple read or cluster failure" }, 
-
+    "Time-out, most likely caused by simple read or cluster failure" }, 
+  
   /**
    * TemporaryResourceError
    */