diff options
| author | unknown <monty@mysql.com> | 2004-11-02 18:54:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-02 18:54:16 +0200 |
| commit | 3200d66f8544dad77dc7ba8448550f3a15fa8eac (patch) | |
| tree | 220c894342d371137d4e36b99eafb9861a3af25d /ndb/src/ndbapi/NdbOperationExec.cpp | |
| parent | 94839ddf5e23998c4e90776912f7d92a90277628 (diff) | |
| parent | 2ddf5682e1f049c80c45d4a148ffd374a9feacf7 (diff) | |
| download | mariadb-git-3200d66f8544dad77dc7ba8448550f3a15fa8eac.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
innobase/dict/dict0load.c:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbOperationExec.cpp')
| -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 fa46e93a57f..6d7a3817e04 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 != -1 ? m_abortOption : theNdbCon->m_abortOption; + m_abortOption != (Int8)-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 != -1 ? m_abortOption : theNdbCon->m_abortOption); + (m_abortOption != (Int8)-1 ? m_abortOption : theNdbCon->m_abortOption); theReceiver.m_received_result_length = ~0; theStatus = Finished; |