diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-25 11:30:33 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-25 11:30:33 +0000 |
| commit | ad2a55c27e294b7c81d14db237a37fc44e604236 (patch) | |
| tree | a26677a12fc2c72e1495df68bd93854798cea220 /ndb | |
| parent | cb365f99b3b9385e805095306b9fa5d7e6f07767 (diff) | |
| download | mariadb-git-ad2a55c27e294b7c81d14db237a37fc44e604236.tar.gz | |
removed compiler warning
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp index afde88c47a2..8677ae741b3 100644 --- a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp +++ b/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp @@ -172,7 +172,7 @@ Dbtux::execTUX_BOUND_INFO(Signal* signal) BoundInfo& b = boundInfo[j][attrId]; if (b.type != -1) { // compare with previous bound - if (b.type != type2 || + if (b.type != (int)type2 || b.size != 2 + dataSize || memcmp(&data[b.offset + 2], &data[offset + 2], dataSize << 2) != 0) { jam(); diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index 83f349bd435..f03b324ecfe 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -1656,7 +1656,10 @@ MgmtSrvr::setSignalLoggingMode(int processId, LogMode mode, logSpec = TestOrd::InputOutputSignals; break; default: - assert("Unexpected value, MgmtSrvr::setSignalLoggingMode" == 0); + ndbout_c("Unexpected value %d, MgmtSrvr::setSignalLoggingMode, line %d", + (unsigned)mode, __LINE__); + assert(false); + return -1; } NdbApiSignal* signal = getSignal(); |