bk commit into 4.1 tree (joreland:1.2240) BUG#10142

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.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
  1.2240 05/05/09 11:03:07 joreland@stripped +1 -0
  bug#10142 - ndb unique index resource shortage
    honor abort_option as TC now abort on 288

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.16 05/05/09 11:03:04 joreland@stripped +1 -1
    honor settings as TC now abort on 288

# 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.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.15/ndb/src/ndbapi/NdbIndexOperation.cpp	Tue May  3 12:16:28 2005
+++ 1.16/ndb/src/ndbapi/NdbIndexOperation.cpp	Mon May  9 11:03:04 2005
@@ -752,5 +752,5 @@
   Uint32 errorCode = tcIndxRef->errorCode;
   theError.code = errorCode;
   theNdbCon->setOperationErrorCodeAbort(errorCode);
-  return theNdbCon->OpCompleteFailure(AbortOnError);
+  return theNdbCon->OpCompleteFailure(theNdbCon->m_abortOption);
 }//NdbIndexOperation::receiveTCINDXREF()