From a6aaa907d1050eb6e7e6fce9ff56f142df043a2a Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Tue, 2 Nov 2004 15:37:26 +0100
Subject: [PATCH] Make sure that Int8(16,32,64) is signed Better fix for
 previous build issue

---
 ndb/include/ndb_types.h             | 10 +++++-----
 ndb/src/ndbapi/NdbOperationExec.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h
index a2988dbae78..64b3f517934 100644
--- a/ndb/include/ndb_types.h
+++ b/ndb/include/ndb_types.h
@@ -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
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;