bk commit into 5.0 tree (jonas:1.2267)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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-10-19 09:38:37+02:00, jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
  MERGE: 1.2216.68.17

  ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-10-19 09:38:34+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.48.1.2

  sql/ha_ndbcluster.cc@stripped, 2006-10-19 09:38:34+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.273.3.2

# 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.0-ndb/RESYNC

--- 1.50/ndb/src/ndbapi/NdbTransaction.cpp	2006-10-19 09:38:41 +02:00
+++ 1.51/ndb/src/ndbapi/NdbTransaction.cpp	2006-10-19 09:38:41 +02:00
@@ -357,8 +357,15 @@
       ret = -1;
       if(savedError.code==0)
 	savedError= theError;
+      
+      /**
+       * If AO_IgnoreError, error codes arent always set on individual
+       *   operations, making postExecute impossible
+       */
+      if (abortOption == AO_IgnoreError)
+	DBUG_RETURN(-1);
     }
-
+    
 #ifdef ndb_api_crash_on_complex_blob_abort
     assert(theFirstOpInList == NULL && theLastOpInList == NULL);
 #else

--- 1.281/sql/ha_ndbcluster.cc	2006-10-19 09:38:41 +02:00
+++ 1.282/sql/ha_ndbcluster.cc	2006-10-19 09:38:41 +02:00
@@ -1595,7 +1595,9 @@
   int res;
   DBUG_ENTER("peek_indexed_rows");
 
-  NdbOperation::LockMode lm= NdbOperation::LM_Read;
+  NdbOperation::LockMode lm=
+    (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
+  
   first= NULL;
   if (table->s->primary_key != MAX_KEY)
   {