Commit f0fb0d17 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
parents bb06ec21 b8812c85

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -1892,7 +1892,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/common/debugger/EventLogger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ void getTextMemoryUsage(QQQQ) { 
  const int used = theData[3];

  const int total = theData[4];

  const int block = theData[5];

  const int percent = (used*100)/total;

  const int percent = total ? (used*100)/total : 0;

  

  BaseString::snprintf(m_text, m_text_len,

		       "%s usage %s %d%s(%d %dK pages of total %d)",

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ void Dbacc::initData() 
  scanRec = 0;

  tabrec = 0;



  cnoOfAllocatedPages = cpagesize = 0;

  // Records with constant sizes

}//Dbacc::initData()

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void Dbacc::execCONTINUEB(Signal* signal) 
  case ZREPORT_MEMORY_USAGE:{

    jam();

    static int c_currentMemUsed = 0;

    int now = (cnoOfAllocatedPages * 100)/cpagesize;

    int now = cpagesize ? (cnoOfAllocatedPages * 100)/cpagesize : 0;

    const int thresholds[] = { 99, 90, 80, 0};

    

    Uint32 i = 0;

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,7 @@ void Dbtc::execTCRELEASEREQ(Signal* signal) 
	   apiConnectptr.p->firstTcConnect == RNIL))

      {

        jam();                                   /* JUST REPLY OK */

	apiConnectptr.p->m_transaction_nodes.clear();

        releaseApiCon(signal, apiConnectptr.i);

        signal->theData[0] = tuserpointer;

        sendSignal(tapiBlockref,