diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-24 15:09:18 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-24 15:09:18 +0000 |
| commit | 90f0161e9b33318398bc86518151998324c77dda (patch) | |
| tree | e7fd44c00d9b29e1c39d0fd561df06572a3c6adb /ndb | |
| parent | f1a132c3ee33282a75949d0103f65b9456951f0b (diff) | |
| download | mariadb-git-90f0161e9b33318398bc86518151998324c77dda.tar.gz | |
removed compiler warnings
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/grep/Grep.cpp | 8 | ||||
| -rw-r--r-- | ndb/src/kernel/vm/Emulator.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/grep/Grep.cpp b/ndb/src/kernel/blocks/grep/Grep.cpp index 8b93ef9cd20..0e41182348f 100644 --- a/ndb/src/kernel/blocks/grep/Grep.cpp +++ b/ndb/src/kernel/blocks/grep/Grep.cpp @@ -619,6 +619,12 @@ Grep::PSCoord::execCREATE_SUBID_REF(Signal* signal) { { jam(); err = GrepError::SUBSCRIPTION_ID_SUMA_FAILED_CREATE; + } else { + jam(); + ndbrequire(false); /* Added since errorcode err unhandled + * TODO: fix correct errorcode + */ + err= GrepError::NO_ERROR; // remove compiler warning } SubCoordinatorPtr subPtr; @@ -1819,6 +1825,7 @@ Grep::PSCoord::sendRefToSS(Signal * signal, break; default: ndbrequire(false); + event= GrepEvent::Rep_Disconnect; // remove compiler warning } /** * Finally, send an event. @@ -1906,6 +1913,7 @@ Grep::PSPart::sendRefToPSCoord(Signal * signal, break; default: ndbrequire(false); + event= GrepEvent::Rep_Disconnect; // remove compiler warning } /** diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp index 202c6547a81..a5897cd4064 100644 --- a/ndb/src/kernel/vm/Emulator.cpp +++ b/ndb/src/kernel/vm/Emulator.cpp @@ -155,7 +155,7 @@ NdbShutdown(NdbShutdownType type, break; default: ndbout << "Error handler " << shutting << " system" - << " (unknown type: " << type << ")" << endl; + << " (unknown type: " << (unsigned)type << ")" << endl; type = NST_ErrorHandler; break; } |