bk commit into 5.1 tree (jonas:1.2363)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-12-15 17:14:41+01:00, jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  MERGE: 1.2344.3.12

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-12-15 17:14:38+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.70.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2006-12-15 17:14:38+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.58.1.1

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb/RESYNC

--- 1.59/storage/ndb/test/run-test/daily-basic-tests.txt	2006-12-15 17:14:46 +01:00
+++ 1.60/storage/ndb/test/run-test/daily-basic-tests.txt	2006-12-15 17:14:46 +01:00
@@ -231,6 +231,14 @@
 cmd: testTimeout
 args: T1 
 
+max-time: 500
+cmd: testBasic
+args: -n Bug25090 T1
+
+max-time: 500
+cmd: testIndex
+args: -n Bug25059 -r 3000 T1
+
 # SCAN TESTS
 #
 max-time: 500

--- 1.71/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-15 17:14:46 +01:00
+++ 1.72/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-15 17:14:46 +01:00
@@ -477,6 +477,7 @@
          * This timeout situation can occur if NDB crashes.
          */
         ndbout << "This timeout should never occur, execute(..)" << endl;
+	theError.code = 4012;
         setOperationErrorCodeAbort(4012);  // Error code for "Cluster Failure"
         DBUG_RETURN(-1);
       }//if
@@ -1979,6 +1980,14 @@
       }
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
+
+      if (m_abortOption == AO_IgnoreError && theError.code != 0){
+	/**
+	 * There's always a TCKEYCONF when using IgnoreError
+	 */
+	return -1;
+      }
+
       /**********************************************************************/
       // We sent the transaction with Commit flag set and received a CONF with
       // no Commit flag set. This is clearly an anomaly.