Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/51-work

sql/ha_ndbcluster.cc

@@ -1875,7 +1875,8 @@ int ha_ndbcluster::peek_indexed_rows(const byte *record)
   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)
   {

storage/ndb/src/ndbapi/NdbTransaction.cpp

@@ -360,8 +360,15 @@ NdbTransaction::execute(ExecType aTypeOfExec,
       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