bk commit into 5.1 tree (jonas:1.2329)

[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, 2006-11-21 14:23:42+01:00, jonas@stripped +2 -0
  ndb - no bugs number
    1) Make sure not to read uninitialized data in unique index code
        harmless (atleast before dynattr)
    2) Dont update p_latest_trans_gci
        for dirty unique index lookup
    

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp@stripped, 2006-11-21 14:23:41+01:00, jonas@stripped +12 -0
    Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
    

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-11-21 14:23:41+01:00, jonas@stripped +4 -2
    Dont update p_latest_trans_gci
      for dirty unique index lookup 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.25/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-11-21 14:23:47 +01:00
+++ 1.26/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-11-21 14:23:47 +01:00
@@ -833,6 +833,15 @@
 //--------------------------------------------------------------------
 // Read Primary Key Values
 //--------------------------------------------------------------------
+  Tuple_header *save0= req_struct->m_tuple_ptr;
+  if (regOperPtr->op_struct.op_type == ZDELETE && 
+      !regOperPtr->is_first_operation())
+  {
+    jam();
+    req_struct->m_tuple_ptr= (Tuple_header*)
+      c_undo_buffer.get_ptr(&req_struct->prevOpPtr.p->m_copy_tuple_location);
+  }
+
   if (regTabPtr->need_expand()) 
     prepare_read(req_struct, regTabPtr, true);
   
@@ -844,6 +853,9 @@
 			   false);
   ndbrequire(ret != -1);
   noPrimKey= ret;
+  
+  req_struct->m_tuple_ptr = save0;
+  
   Uint32 numAttrsToRead;
   if ((regOperPtr->op_struct.op_type == ZUPDATE) &&
       (trigPtr->sendOnlyChangedAttributes)) {

--- 1.63/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-11-21 14:23:47 +01:00
+++ 1.64/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-11-21 14:23:47 +01:00
@@ -1970,8 +1970,10 @@
     if (tCommitFlag == 1) {
       theCommitStatus = Committed;
       theGlobalCheckpointId = tGCI;
-      assert(tGCI);
-      *p_latest_trans_gci = tGCI;
+      if (tGCI) // Read(dirty) only transaction doesnt get GCI
+      {
+	*p_latest_trans_gci = tGCI;
+      }
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
       /**********************************************************************/