mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
unknown 2004-11-02 15:37:53 +01:00
commit 6293a5787b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ndb/include/ndb_types.h
View file

@ -21,11 +21,11 @@
#ifndef NDB_TYPES_H
#define NDB_TYPES_H
typedef char Int8;
typedef signed char Int8;
typedef unsigned char Uint8;
typedef short Int16;
typedef signed short Int16;
typedef unsigned short Uint16;
typedef int Int32;
typedef signed int Int32;
typedef unsigned int Uint32;
typedef unsigned int UintR;
@ -45,10 +45,10 @@ typedef uintptr_t UintPtr;
#if defined(WIN32) || defined(NDB_WIN32)
typedef unsigned __int64 Uint64;
typedef __int64 Int64;
typedef signed __int64 Int64;
#else
typedef unsigned long long Uint64;
typedef long long Int64;
typedef signed long long Int64;
#endif
#endif

4
ndb/src/ndbapi/NdbOperationExec.cpp
View file

@ -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;