bk commit into 5.1 tree (jonas:1.2662) BUG#31482

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-15 11:26:11+02:00, jonas@stripped +2 -0
  ndb - 51-ndb -> 6.2 post merge bug#31482
    also fix NdbRecord code path

  storage/ndb/src/ndbapi/NdbReceiver.cpp@stripped, 2007-10-15 11:26:08+02:00,
jonas@stripped +1 -1
    post merge

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2007-10-15 11:26:08+02:00,
jonas@stripped +7 -1
    post merge

diff -Nrup a/storage/ndb/src/ndbapi/NdbReceiver.cpp
b/storage/ndb/src/ndbapi/NdbReceiver.cpp
--- a/storage/ndb/src/ndbapi/NdbReceiver.cpp	2007-10-15 10:05:56 +02:00
+++ b/storage/ndb/src/ndbapi/NdbReceiver.cpp	2007-10-15 11:26:08 +02:00
@@ -636,7 +636,7 @@ NdbReceiver::execTRANSID_AI(const Uint32
     m_received_result_length = tmp;
     m_record.m_row+= m_record.m_row_offset;
 
-    return (tmp == exp || (exp > TcKeyConf::SimpleReadBit) ? 1 : 0);
+    return (tmp == exp || (exp > TcKeyConf::DirtyReadBit) ? 1 : 0);
   }
 
   /* The old way, using getValue() and NdbRecAttr. */
diff -Nrup a/storage/ndb/src/ndbapi/NdbTransaction.cpp
b/storage/ndb/src/ndbapi/NdbTransaction.cpp
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-10-15 10:05:57 +02:00
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-10-15 11:26:08 +02:00
@@ -2259,8 +2259,14 @@ NdbTransaction::readTuple(const NdbRecor
     op->theDirtyIndicator= 1;
     op->theSimpleIndicator= 1;
   }
-  else
+  else 
   {
+    if (op->theLockMode == NdbOperation::LM_SimpleRead)
+    {
+      op->theSimpleIndicator = 1;
+    }
+    
+    
     theSimpleState= 0;
   }