database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com
2005-03-08 10:28:38 +01:00
parent 112471e382 fcd7b0ebc6
commit 75d705930d
1 changed files with 17 additions and 3 deletions
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(); Uint64 now = NdbTick_CurrentMillisecond();
if(now > c_start.m_startFailureTimeout){ if(now > c_start.m_startFailureTimeout)
ndbrequire(false); {
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; signal->theData[0] = ZSTARTUP;
@@ -413,7 +427,7 @@ inline
Uint64 Uint64
setTimeout(Uint64 time, Uint32 timeoutValue){ setTimeout(Uint64 time, Uint32 timeoutValue){
if(timeoutValue == 0) if(timeoutValue == 0)
return ~0; return ~(Uint64)0;
return time + timeoutValue; return time + timeoutValue;
} }