bk commit into 5.1 tree (jonas:1.2528) BUG#33739

[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, 2008-01-08 13:23:35+01:00, jonas@stripped +1 -0
  ndb - bug#33739
    page need to refetched after timeslice

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2008-01-08 13:23:33+01:00, jonas@stripped +18 -0
    ndb - bug#33739
      page need to refetched after timeslice

# 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.24/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2008-01-08 13:23:38 +01:00
+++ 1.25/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2008-01-08 13:23:38 +01:00
@@ -601,6 +601,24 @@
 
   if (lcp && lcp_list != RNIL)
     goto found_lcp_keep;
+
+  switch(pos.m_get){
+  case ScanPos::Get_next_tuple:
+  case ScanPos::Get_next_tuple_fs:
+    jam();
+    key.m_page_idx += size;
+    // fall through
+  case ScanPos::Get_tuple:
+  case ScanPos::Get_tuple_fs:
+    jam();
+    /**
+     * We need to refetch page after timeslice
+     */
+    pos.m_get = ScanPos::Get_page;
+    break;
+  default:
+    break;
+  }
   
   while (true) {
     switch (pos.m_get) {