Commit fdfabb82 authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
parents 591f3194 d262020f

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -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

+8 −1
Original line number Diff line number Diff line
@@ -360,6 +360,13 @@ 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