bk commit into 5.1 tree (joreland:1.1915)

[jonas.oreland]

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
  1.1915 05/06/02 13:27:17 joreland@stripped +1 -0
  ndb - fix GCP complete record comming of of order other GCI's (on records)
        Used during resend incase of NF

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.44 05/06/02 13:27:14 joreland@stripped +5 -3
    decrease sz to compensate for GCI (in buffer)

# 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:	joreland
# Host:	eel.ndb.mysql.com.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-wl2325

--- 1.43/storage/ndb/src/kernel/blocks/suma/Suma.cpp	Wed Jun  1 16:22:10 2005
+++ 1.44/storage/ndb/src/kernel/blocks/suma/Suma.cpp	Thu Jun  2 13:27:14 2005
@@ -4035,8 +4035,8 @@
   Buffer_page* page= (Buffer_page*)(m_tup->page+pos.m_page_id);
   Uint32* ptr= page->m_data + pos.m_page_pos;
 
-  const bool same_gci = gci == pos.m_last_gci;
-
+  const bool same_gci = (gci == pos.m_last_gci) && (!ERROR_INSERTED(13022));
+  
   pos.m_page_pos += sz;
   pos.m_last_gci = gci;
   Uint32 max = pos.m_max_gci > gci ? pos.m_max_gci : gci;
@@ -4394,12 +4394,14 @@
     Uint32 tmp = * src++;
     Uint32 sz = tmp & 0xFFFF;
 
+    ptr += sz;
+
     if(! (tmp & (0x8000 << 16)))
     {
+      sz--;
       last_gci = * src ++;
     }
 
-    ptr += sz;
     if(last_gci < min_gci)
     {
       continue;