1 files changed, 21 insertions, 7 deletions

diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/ndb/src/ndbapi/NdbOperationDefine.cpp
index 1cbfedd21b1..35abb15b00d 100644
--- a/ndb/src/ndbapi/NdbOperationDefine.cpp
+++ b/ndb/src/ndbapi/NdbOperationDefine.cpp
@@ -55,6 +55,7 @@ NdbOperation::insertTuple()
     theOperationType = InsertRequest;
     tNdbCon->theSimpleState = 0;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Exclusive;
     return 0; 
   } else {
     setErrorCode(4200);
@@ -74,6 +75,7 @@ NdbOperation::updateTuple()
     tNdbCon->theSimpleState = 0;
     theOperationType = UpdateRequest;  
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Exclusive;
     return 0; 
   } else {
     setErrorCode(4200);
@@ -93,6 +95,7 @@ NdbOperation::writeTuple()
     tNdbCon->theSimpleState = 0;
     theOperationType = WriteRequest;  
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Exclusive;
     return 0; 
   } else {
     setErrorCode(4200);
@@ -113,8 +116,10 @@ NdbOperation::readTuple(NdbOperation::LockMode lm)
     return readTupleExclusive();
     break;
   case LM_CommittedRead:
-    return readTuple();
+    return committedRead();
     break;
+  default:
+    return -1;
   };
 }
 /******************************************************************************
@@ -130,6 +135,7 @@ NdbOperation::readTuple()
     tNdbCon->theSimpleState = 0;
     theOperationType = ReadRequest;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Read;
     return 0;
   } else {
     setErrorCode(4200);
@@ -150,6 +156,7 @@ NdbOperation::deleteTuple()
     tNdbCon->theSimpleState = 0;
     theOperationType = DeleteRequest;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Exclusive;
     return 0;
   } else {
     setErrorCode(4200);
@@ -170,6 +177,7 @@ NdbOperation::readTupleExclusive()
     tNdbCon->theSimpleState = 0;
     theOperationType = ReadExclusive;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Exclusive;
     return 0;
   } else {
     setErrorCode(4200);
@@ -183,17 +191,24 @@ NdbOperation::readTupleExclusive()
 int
 NdbOperation::simpleRead()
 {
+  /**
+   * Currently/still disabled
+   */
+  return readTuple();
+#if 0
   int tErrorLine = theErrorLine;
   if (theStatus == Init) {
     theStatus = OperationDefined;
     theOperationType = ReadRequest;
     theSimpleIndicator = 1;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_Read;
     return 0;
   } else {
     setErrorCode(4200);
     return -1;
   }//if
+#endif
 }//NdbOperation::simpleRead()
 
 /*****************************************************************************
@@ -218,6 +233,7 @@ NdbOperation::committedRead()
     theSimpleIndicator = 1;
     theDirtyIndicator = 1;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_CommittedRead;
     return 0;
   } else {
     setErrorCode(4200);
@@ -240,6 +256,7 @@ NdbOperation::dirtyUpdate()
     theSimpleIndicator = 1;
     theDirtyIndicator = 1;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_CommittedRead;
     return 0;
   } else {
     setErrorCode(4200);
@@ -262,6 +279,7 @@ NdbOperation::dirtyWrite()
     theSimpleIndicator = 1;
     theDirtyIndicator = 1;
     theErrorLine = tErrorLine++;
+    theLockMode = LM_CommittedRead;
     return 0;
   } else {
     setErrorCode(4200);
@@ -282,7 +300,7 @@ NdbOperation::interpretedUpdateTuple()
     tNdbCon->theSimpleState = 0;
     theOperationType = UpdateRequest;
     theAI_LenInCurrAI = 25;
-
+    theLockMode = LM_Exclusive;
     theErrorLine = tErrorLine++;
     initInterpreter();
     return 0;
@@ -307,7 +325,7 @@ NdbOperation::interpretedDeleteTuple()
 
     theErrorLine = tErrorLine++;
     theAI_LenInCurrAI = 25;
-
+    theLockMode = LM_Exclusive;
     initInterpreter();
     return 0;
   } else {
@@ -334,10 +352,6 @@ NdbOperation::getValue_impl(const NdbColumnImpl* tAttrInfo, char* aValue)
   if ((tAttrInfo != NULL) &&
       (!tAttrInfo->m_indexOnly) && 
       (theStatus != Init)){
-    if (theStatus == SetBound) {
-      ((NdbIndexScanOperation*)this)->saveBoundATTRINFO();
-      theStatus = GetValue;
-    }
     if (theStatus != GetValue) {
       if (theInterpretIndicator == 1) {
 	if (theStatus == FinalGetValue) {