Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged

ndb/src/ndbapi/ndberror.c

@@ -144,10 +144,10 @@ ErrorBundle ErrorCodes[] = {
   { 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
    */

ndb/test/src/NdbBackup.cpp

@@ -244,8 +244,8 @@ NdbBackup::NFSlave(NdbRestarter& _restarter){
 
 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;