bk commit into 5.0 tree (msvensson:1.2112)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2112 06/05/05 14:00:28 msvensson@neptunus.(none) +1 -0
  Fix merge problem

  ndb/tools/delete_all.cpp
    1.20 06/05/05 14:00:10 msvensson@neptunus.(none) +2 -2
    Fix merge problem

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.19/ndb/tools/delete_all.cpp	2006-05-05 12:30:35 +02:00
+++ 1.20/ndb/tools/delete_all.cpp	2006-05-05 14:00:10 +02:00
@@ -105,7 +105,7 @@
 
 
 int clear_table(Ndb* pNdb, const NdbDictionary::Table* pTab,
-                bool commit_across_open_cursor, int parallelism)
+                bool fetch_across_commit, int parallelism)
 {
   // Scan all records exclusive and delete 
   // them one by one
@@ -166,7 +166,7 @@
       } while((check = pOp->nextResult(false)) == 0);
       
       if(check != -1){
-        if (commit_across_open_cursor) {
+        if (fetch_across_commit) {
           check = pTrans->execute(NdbTransaction::Commit);   
           pTrans->restart(); // new tx id
         } else {