diff options
| author | unknown <joreland@mysql.com> | 2004-11-02 20:40:56 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-02 20:40:56 +0100 |
| commit | 60d1fbc9bb5b0a9385be7263394e79ddf2085e36 (patch) | |
| tree | f7e90c126454ae8a9c356c3abd51e6fe30c0d8c3 /ndb/src | |
| parent | 5ff32da2653b8f6dfb2701a69153ff55cd4fca56 (diff) | |
| parent | 6293a5787bffb38cbc7ce4f28b170d45863de7d8 (diff) | |
| download | mariadb-git-60d1fbc9bb5b0a9385be7263394e79ddf2085e36.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/ndbapi/NdbOperationExec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/ndb/src/ndbapi/NdbOperationExec.cpp index 6d7a3817e04..fa46e93a57f 100644 --- a/ndb/src/ndbapi/NdbOperationExec.cpp +++ b/ndb/src/ndbapi/NdbOperationExec.cpp @@ -192,7 +192,7 @@ NdbOperation::prepareSend(Uint32 aTC_ConnectPtr, Uint64 aTransId) OperationType tOperationType = theOperationType; Uint32 tTupKeyLen = theTupKeyLen; Uint8 abortOption = - m_abortOption != (Int8)-1 ? m_abortOption : theNdbCon->m_abortOption; + m_abortOption != -1 ? m_abortOption : theNdbCon->m_abortOption; tcKeyReq->setDirtyFlag(tReqInfo, tDirtyIndicator); tcKeyReq->setOperationType(tReqInfo, tOperationType); @@ -543,7 +543,7 @@ NdbOperation::receiveTCKEYREF( NdbApiSignal* aSignal) }//if AbortOption ao = (AbortOption) - (m_abortOption != (Int8)-1 ? m_abortOption : theNdbCon->m_abortOption); + (m_abortOption != -1 ? m_abortOption : theNdbCon->m_abortOption); theReceiver.m_received_result_length = ~0; theStatus = Finished; |