Commit c04e4727 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

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


sql/ha_ndbcluster.cc:
  Auto merged
parents 4075cd89 6134c072

ndb/src/common/debugger/EventLogger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -647,7 +647,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)",

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

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

  undopage = 0;



  cnoOfAllocatedPages = cpagesize = 0;

  // Records with constant sizes

}//Dbacc::initData()

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

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

ndb/src/kernel/blocks/dbtup/DbtupGen.cpp

+2 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ Dbtup::Dbtup(const class Configuration & conf) 
  tablerec = 0;  

  tableDescriptor = 0;  

  undoPage = 0;

  cnoOfPage = cnoOfAllocatedPages = 0;

}//Dbtup::Dbtup()



Dbtup::~Dbtup()
@@ -526,7 +527,7 @@ void Dbtup::execCONTINUEB(Signal* signal) 
  case ZREPORT_MEMORY_USAGE:{

    ljam();

    static int c_currentMemUsed = 0;

    int now = (cnoOfAllocatedPages * 100)/cnoOfPage;

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

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

    

    Uint32 i = 0;

ndb/src/ndbapi/NdbTransaction.cpp

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