bk commit into 5.1-ndb tree (joreland:1.1866)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
5.1-ndb repository of jonas. When jonas 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.1866 05/04/22 10:05:40 joreland@stripped +1 -0
  merge

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.31 05/04/22 10:05:36 joreland@stripped +3 -3
    merge

# 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:	joreland
# Host:	eel.hemma.oreland.se.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.30/ndb/src/kernel/blocks/backup/Backup.cpp	Fri Apr 22 10:00:25 2005
+++ 1.31/ndb/src/kernel/blocks/backup/Backup.cpp	Fri Apr 22 10:05:36 2005
@@ -4583,7 +4583,7 @@
   jam();
   BackupFilePtr filePtr;
   c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
-  filePtr.p->fileDone = 1;
+  filePtr.p->fileClosing = 1;
   filePtr.p->operation.dataBuffer.eof();
 }
 
@@ -4625,7 +4625,7 @@
   BackupFilePtr filePtr;
   c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
   ndbrequire(filePtr.p->fileRunning == 0);
-  filePtr.p->fileDone = 0;
+  filePtr.p->fileClosing = 0;
   filePtr.p->fileRunning = 1;
   
   req->userPointer = filePtr.i;
@@ -4676,7 +4676,7 @@
   
     BackupFilePtr filePtr;
     c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
-    filePtr.p->fileDone = 1;
+    filePtr.p->fileClosing = 1;
     filePtr.p->operation.dataBuffer.eof();
     return;
   }