bzr commit into mysql-5.1 branch (zhou.li:2800)

[Leonard Zhou]

#At file:///home/zhl/mysql/mysql-5.1-telco-6.3-bug34526/

 2800 Leonard Zhou	2009-01-13 [merge]
      Merge 6.2 to 6.3
modified:
  storage/ndb/src/kernel/blocks/backup/Backup.cpp
  storage/ndb/src/ndbapi/ndberror.c

=== modified file 'storage/ndb/src/kernel/blocks/backup/Backup.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2008-09-30 07:40:45 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2009-01-13 08:25:21 +0000
@@ -2345,7 +2345,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))
     {
@@ -4828,6 +4828,7 @@ Backup::execABORT_BACKUP_ORD(Signal* sig
   default:
 #endif
     ptr.p->setErrorCode(requestType);
+    ptr.p->masterData.errorCode = requestType;
     ok= true;
   }
   ndbrequire(ok);

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2008-10-21 13:13:10 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2009-01-13 08:25:21 +0000
@@ -687,6 +687,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 with file permissions, please check file system" },
   { 2815, DMEC, TR, "Error in reading files, please check file system" },
 
   { NO_CONTACT_WITH_PROCESS, DMEC, AE,