bk commit into 5.1 tree (jonas:1.2457) BUG#27757

[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-04-12 06:59:56+02:00, jonas@stripped +1 -0
  ndb - bug#27757
    tupscan misses uncommitted inserts by own transaction
      let tupkeyreq handle dirty/savepoint
  
    also siable diskscan as temporary fix for bug#27776

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-04-12 06:59:54+02:00,
jonas@stripped +5 -3
    let tupkeyreq handle dirty/savepoint

# 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-telco-gca

--- 1.18/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2007-04-12 07:00:01 +02:00
+++ 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2007-04-12 07:00:01 +02:00
@@ -61,11 +61,15 @@
 	jam();
 	break;
       }
+
+#if BUG_27776_FIXED
       if (!AccScanReq::getNoDiskScanFlag(req->requestInfo)
 	  && tablePtr.p->m_no_of_disk_attributes)
       {
 	bits |= ScanOp::SCAN_DD;
       }
+#endif
+      
       bool mm = (bits & ScanOp::SCAN_DD);
       if (tablePtr.p->m_attributes[mm].m_no_of_varsize > 0) {
 	bits |= ScanOp::SCAN_VS;
@@ -593,7 +597,6 @@
  
   const bool mm = (bits & ScanOp::SCAN_DD);
   const bool lcp = (bits & ScanOp::SCAN_LCP);
-  const bool dirty = (bits & ScanOp::SCAN_LOCK) == 0;
   
   Uint32 lcp_list = fragPtr.p->m_lcp_keep_list;
   Uint32 size = table.m_offsets[mm].m_fix_header_size +
@@ -764,8 +767,7 @@
 	    jam();
 	    if (! (thbits & Tuple_header::FREE))
 	    {
-	      if (! ((thbits & Tuple_header::ALLOC) && dirty))
-		goto found_tuple;
+              goto found_tuple;
 	    } 
 	  }
 	  else