bk commit into 5.1 tree (lzhou:1.2586) BUG#34526

[lzhou]

Below is the list of changes that have just been committed into a local
5.1 repository of lzhou.  When lzhou 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, 2008-04-21 15:08:56+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#34526 Not output backup report when backup failed

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2008-04-21 15:08:47+00:00,
lzhou@dev3-63.(none) +2 -1
    Not report backup status when backup failed

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2008-04-21 15:08:47+00:00, lzhou@dev3-63.(none)
+1 -0
    Add error code description

diff -Nrup a/storage/ndb/src/kernel/blocks/backup/Backup.cpp
b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2008-03-25 15:47:04 +00:00
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2008-04-21 15:08:47 +00:00
@@ -2347,7 +2347,7 @@ Backup::stopBackupReply(Signal* signal, 
 
   sendAbortBackupOrd(signal, ptr, AbortBackupOrd::BackupComplete);
   
-  if(!ptr.p->checkError())
+  if(!ptr.p->checkError() &&  ptr.p->masterData.errorCode == 0)
   {
     if (SEND_BACKUP_COMPLETED_FLAG(ptr.p->flags))
     {
@@ -4817,6 +4817,7 @@ Backup::execABORT_BACKUP_ORD(Signal* sig
   default:
 #endif
     ptr.p->setErrorCode(requestType);
+    ptr.p->masterData.errorCode = requestType;
     ok= true;
   }
   ndbrequire(ok);
diff -Nrup a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
--- a/storage/ndb/src/ndbapi/ndberror.c	2008-04-08 15:08:07 +00:00
+++ b/storage/ndb/src/ndbapi/ndberror.c	2008-04-21 15:08:47 +00:00
@@ -683,6 +683,7 @@ ErrorBundle ErrorCodes[] = {
   { 4298, DMEC, AE, "Invalid or unsupported ScanOptions structure" },
   { 4299, DMEC, AE, "Incorrect combination of ScanOption flags, extraGetValues ptr and
numExtraGetValues" },
   { 2810, DMEC, TR, "No space left on the device" },
+  { 2811, DMEC, TR, "Error in permission denied, please check file system" },
   { 2815, DMEC, TR, "Error in reading files, please check file system" },
 
   { NO_CONTACT_WITH_PROCESS, DMEC, AE,