Commit 1830b0be authored by unknown's avatar unknown
Browse files

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

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


ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
parents 08e23eb6 d326ec4e

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+17 −3
Original line number Diff line number Diff line
@@ -103,8 +103,22 @@ void Ndbcntr::execCONTINUEB(Signal* signal) 
    }

    

    Uint64 now = NdbTick_CurrentMillisecond();

    if(now > c_start.m_startFailureTimeout){

      ndbrequire(false);

    if(now > c_start.m_startFailureTimeout)

    {

      jam();

      Uint32 to_3= 0;

      const ndb_mgm_configuration_iterator * p = 

	theConfiguration.getOwnConfigIterator();

      ndb_mgm_get_int_parameter(p, CFG_DB_START_FAILURE_TIMEOUT, &to_3);

      BaseString tmp;

      tmp.append("Shutting down node as total restart time exceeds "

		 " StartFailureTimeout as set in config file ");

      if(to_3 == 0)

	tmp.append(" 0 (inifinite)");

      else

	tmp.appfmt(" %d", to_3);

      

      progError(__LINE__, ERR_SYSTEM_ERROR, tmp.c_str());

    }

    

    signal->theData[0] = ZSTARTUP;
@@ -413,7 +427,7 @@ inline 
Uint64

setTimeout(Uint64 time, Uint32 timeoutValue){

  if(timeoutValue == 0)

    return ~0;

    return ~(Uint64)0;

  return time + timeoutValue;

}

ndb/src/kernel/blocks/trix/Trix.cpp

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ void Trix::setupSubscription(Signal* signal, SubscriptionRecPtr subRecPtr) 
  subCreateReq->subscriptionType = SubCreateReq::SingleTableScan;

  

  sendSignal(SUMA_REF, GSN_SUB_CREATE_REQ, 

	     signal, SubCreateReq::SignalLength, JBB, orderPtr, 1);

	     signal, SubCreateReq::SignalLength+1, JBB, orderPtr, 1);

}



void Trix::setupTableScan(Signal* signal, SubscriptionRecPtr subRecPtr)