From: Date: April 3 2008 2:30pm
Subject: bk commit into 5.1 tree (jonas:1.2589) BUG#35797
List-Archive: http://lists.mysql.com/commits/44851
X-Bug: 35797
Message-Id: <20080403123020.020AF7C890@perch.localdomain>

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-04-03 14:30:16+02:00, jonas@stripped +1 -0
  ndb - bug#35797
    initialize m_lcp_varpart_len in all branches

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2008-04-03 14:30:13+02:00, jonas@stripped +3 -2
    ndb - bug#35797
      initialize m_lcp_varpart_len in all branches

diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-03-25 14:35:27 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-04-03 14:30:13 +02:00
@@ -2877,9 +2877,10 @@ Dbtup::update_lcp(KeyReqStruct* req_stru
   Uint16 mm_vars= tabPtrP->m_attributes[MM].m_no_of_varsize;
   Uint16 mm_dyns= tabPtrP->m_attributes[MM].m_no_of_dynamic;
 
+  Uint32 varlen32 = 0;
   if (mm_vars || mm_dyns)
   {
-    Uint32 varlen32 = len - fixsz32;
+    varlen32 = len - fixsz32;
     if (mm_dyns == 0)
     {
       ndbassert(len > fixsz32);
@@ -2887,8 +2888,8 @@ Dbtup::update_lcp(KeyReqStruct* req_stru
     Varpart_copy* vp = (Varpart_copy*)ptr->get_end_of_fix_part_ptr(tabPtrP);
     vp->m_len = varlen32;
     memcpy(vp->m_data, src + fixsz32, 4*varlen32);
-    req_struct->m_lcp_varpart_len = varlen32;
   }
+  req_struct->m_lcp_varpart_len = varlen32;
   ptr->m_header_bits |= (tabPtrP->m_bits & Tablerec::TR_DiskPart) ? 
     Tuple_header::DISK_PART : 0;
   req_struct->changeMask.set();