diff options
| author | unknown <joreland@mysql.com> | 2004-10-22 11:01:11 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-10-22 11:01:11 +0200 |
| commit | 25f1344f8ce6467c98e90c0b8ddc33cbe69c22e4 (patch) | |
| tree | f5d589554e22177975e64b2398d3a7ba2e8c9321 /ndb/src | |
| parent | 33466aa35dd06a88cb210683dda5a0b06d859805 (diff) | |
| parent | 9a702d8a31bc7aeec7f1e570163ae9c673c39f62 (diff) | |
| download | mariadb-git-25f1344f8ce6467c98e90c0b8ddc33cbe69c22e4.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index 3a1bf0aac1d..ad346b30ead 100644 --- a/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/ndb/src/mgmsrv/ConfigInfo.cpp @@ -2189,7 +2189,7 @@ ConfigInfo::ConfigInfo() break; } case SECTION: - pinfo.put("SectionType", (Uint32)param._default); + pinfo.put("SectionType", (Uint32)UintPtr(param._default)); break; case STRING: break; diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index 3dc081700ba..fdaa61973d8 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -123,7 +123,7 @@ MgmtSrvr::signalRecvThreadRun() while(!_isStopThread) { SigMatch *handler = NULL; NdbApiSignal *signal = NULL; - if(m_signalRecvQueue.waitFor(siglist, handler, signal)) { + if(m_signalRecvQueue.waitFor(siglist, handler, signal, DEFAULT_TIMEOUT)) { if(handler->function != 0) (this->*handler->function)(signal); } |