Commit af9d2e24 authored by unknown's avatar unknown
Browse files

corrected merge error

parent e21cdc61

storage/ndb/src/ndbapi/NdbOperationExec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ NdbOperation::prepareSend(Uint32 aTC_ConnectPtr, 
// Simple state is set if start and commit is set and it is

// a read request. Otherwise it is set to zero.

//-------------------------------------------------------------

  Uint8 tReadInd = (theOperationType == ReadRequest);

  Uint8 tSimpleState = tReadInd & tSimpleIndicator;



  tcKeyReq->transId1           = tTransId1;

  tcKeyReq->transId2           = tTransId2;