mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/jonas/src/fix

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


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
This commit is contained in:
unknown 2005-03-09 07:50:46 +01:00
commit d326ec4e69
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View file

@ -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;
}

2
ndb/src/kernel/blocks/trix/Trix.cpp
View file

@ -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)