diff options
| author | unknown <mskold@mysql.com> | 2004-09-11 20:53:57 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-09-11 20:53:57 +0200 |
| commit | 387df2f6a53f25a2a360f2b8d9fec49dba541dbe (patch) | |
| tree | 7a2d07329eab66f896573b07b800869309f1ba82 /ndb/src/ndbapi/Ndbif.cpp | |
| parent | 68d99512f9fdd37d3c1cae1fe28c6e932dcbdc32 (diff) | |
| download | mariadb-git-387df2f6a53f25a2a360f2b8d9fec49dba541dbe.tar.gz | |
Reomeved compiler warnings
Diffstat (limited to 'ndb/src/ndbapi/Ndbif.cpp')
| -rw-r--r-- | ndb/src/ndbapi/Ndbif.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ndb/src/ndbapi/Ndbif.cpp b/ndb/src/ndbapi/Ndbif.cpp index 7ad37401b9a..7e11d58912d 100644 --- a/ndb/src/ndbapi/Ndbif.cpp +++ b/ndb/src/ndbapi/Ndbif.cpp @@ -375,7 +375,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) break; case NdbReceiver::NDB_SCANRECEIVER: tCon->theScanningOp->receiver_delivered(tRec); - theWaiter.m_state = (tWaitState == WAIT_SCAN ? NO_WAIT : tWaitState); + theWaiter.m_state = (((WaitSignalType) tWaitState) == WAIT_SCAN ? + (Uint32) NO_WAIT : tWaitState); break; default: goto InvalidSignal; @@ -747,7 +748,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) switch(com){ case 1: tCon->theScanningOp->receiver_delivered(tRec); - theWaiter.m_state = (tWaitState == WAIT_SCAN ? NO_WAIT : tWaitState); + theWaiter.m_state = (((WaitSignalType) tWaitState) == WAIT_SCAN ? + (Uint32) NO_WAIT : tWaitState); break; case 0: break; @@ -871,8 +873,8 @@ Ndb::completedTransaction(NdbConnection* aCon) return; }//if } else { - ndbout << "theNoOfSentTransactions = " << theNoOfSentTransactions; - ndbout << " theListState = " << aCon->theListState; + ndbout << "theNoOfSentTransactions = " << (int) theNoOfSentTransactions; + ndbout << " theListState = " << (int) aCon->theListState; ndbout << " theTransArrayIndex = " << aCon->theTransArrayIndex; ndbout << endl << flush; #ifdef VM_TRACE @@ -923,7 +925,7 @@ Ndb::pollCompleted(NdbConnection** aCopyArray) aCopyArray[i] = theCompletedTransactionsArray[i]; if (aCopyArray[i]->theListState != NdbConnection::InCompletedList) { ndbout << "pollCompleted error "; - ndbout << aCopyArray[i]->theListState << endl; + ndbout << (int) aCopyArray[i]->theListState << endl; abort(); }//if theCompletedTransactionsArray[i] = NULL; |