From: Date: January 18 2006 10:29am
Subject: bk commit into 5.1 tree (tomas:1.1964) BUG#15425
List-Archive: http://lists.mysql.com/internals/33355
X-Bug: 15425
Message-Id: <20060118092926.08897807FD@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1964 06/01/18 10:28:41 tomas@stripped +1 -0
  BUG#15425

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.28 06/01/18 10:28:20 tomas@stripped +8 -3
    BUG#15425

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.27/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2005-11-01 14:59:38 +01:00
+++ 1.28/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-01-18 10:28:20 +01:00
@@ -886,13 +886,17 @@
       pos= &ref->nodeId - signal->getDataPtr();
       break;
     }
+    case GSN_WAIT_GCP_REQ:
+    case GSN_DROP_TRIG_REQ:
     case GSN_CREATE_TRIG_REQ:
     case GSN_ALTER_TRIG_REQ:
-    case GSN_WAIT_GCP_REQ:
+      ptr.p->setErrorCode(AbortBackupOrd::BackupFailureDueToNodeFail);
+      return;
     case GSN_UTIL_SEQUENCE_REQ:
     case GSN_UTIL_LOCK_REQ:
-    case GSN_DROP_TRIG_REQ:
       return;
+    default:
+      ndbrequire(false);
     }
     
     for(Uint32 i = 0; (i = mask.find(i+1)) != NdbNodeBitmask::NotFound; )
@@ -1980,7 +1984,7 @@
       }
     }
   }
-  ndbrequire(false);
+  goto err;
 
 done:
   ptr.p->masterData.sendCounter--;
@@ -1993,6 +1997,7 @@
     return;
   }//if
   
+err:
   AbortBackupOrd *ord = (AbortBackupOrd*)signal->getDataPtrSend();
   ord->backupId = ptr.p->backupId;
   ord->backupPtr = ptr.i;