Commit 674e6e95 authored by unknown's avatar unknown
Browse files

ndb - dbacc - 

  fix gcc4 compile error


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  add block to remove gcc compiler error
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add jamEntry
parent 3f950c92

storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+21 −19
Original line number Diff line number Diff line
@@ -1262,7 +1262,8 @@ Dbacc::startNext(Signal* signal, OperationrecPtr lastOp) 
  ptrCheckGuard(nextOp, coprecsize, operationrec);  

  nextbits = nextOp.p->m_op_bits;

  

  bool same = nextOp.p->is_same_trans(lastOp.p);

  {

    const bool same = nextOp.p->is_same_trans(lastOp.p);

    

    if (!same && ((opbits & Operationrec::OP_ACC_LOCK_MODE) ||

		  (nextbits & Operationrec::OP_LOCK_MODE)))
@@ -1284,6 +1285,7 @@ Dbacc::startNext(Signal* signal, OperationrecPtr lastOp) 
      jam();

      goto upgrade;

    }

  }



  /**

   * all shared lock...

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+6 −0
Original line number Diff line number Diff line
@@ -9063,6 +9063,7 @@ Dblqh::readPrimaryKeys(ScanRecord *scanP, TcConnectionrec *tcConP, Uint32 *dst) 
  }









  int ret = c_tup->accReadPk(tableId, fragId, fragPageId, pageIndex, dst, false);









  jamEntry();









  if(0)









    ndbout_c("readPrimaryKeys(table: %d fragment: %d [ %d %d ] -> %d",









	     tableId, fragId, fragPageId, pageIndex, ret);








@@ -9434,6 +9435,11 @@ Uint32 Dblqh::initScanrec(const ScanFragReq* scanFragReq)







  scanptr.p->m_max_batch_size_rows = max_rows;









  scanptr.p->m_max_batch_size_bytes = max_bytes;

















#if 0









  if (! rangeScan)









    tupScan = 1;









#endif

















  if (! rangeScan && ! tupScan)









    scanptr.p->scanBlockref = tcConnectptr.p->tcAccBlockref;









  else if (! tupScan)