Commit 7404c983 authored by unknown's avatar unknown
Browse files

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
parents 1f8b9551 d69c6e85

ndb/src/ndbapi/ndberror.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 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" },

ndb/test/src/NdbBackup.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

  {

    if(nNodes == 1)

      return NDBT_OK;