bk commit into 5.1 tree (jonas:1.2505)

[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-28 01:03:26+02:00, jonas@stripped +2 -0
  ndb - fix merge error
    cleanup varsize -> 51-telco, for dynattr

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-04-28 01:03:24+02:00, jonas@stripped +5 -10
    fix merge error

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2007-04-28 01:03:24+02:00, jonas@stripped +2 -1
    fix merge error

# 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

--- 1.73/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-04-28 01:03:32 +02:00
+++ 1.74/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-04-28 01:03:32 +02:00
@@ -2709,11 +2709,11 @@
   const Uint16 *order = (Uint16*)(&tableDescriptor[order_desc]);
   order += tabPtrP->m_attributes[MM].m_no_of_fixsize;
   
+  // Copy fix part
+  sizes[MM]= 1;
+  memcpy(ptr, src, 4*fix_size);
   if(mm_vars || mm_dyns)
-  {
-    // Copy fix part
-    memcpy(ptr, src, 4*fix_size);
-    
+  { 
     Uint32 src_len;
     Uint32 step; // in bytes
     const Uint32 *src_data;
@@ -2732,7 +2732,7 @@
         ndbassert(src_len>0);
         src_len= src_data[src_len-1];
       }
-      step= 1;
+      step= 0;
       req_struct->m_varpart_page_ptr = var_page;
     }
     else
@@ -2778,11 +2778,6 @@
     
     ndbassert((UintPtr(src_ptr) & 3) == 0);
     src_ptr = src_ptr + step;
-  }
-  else 
-  {
-    sizes[MM]= 1;
-    memcpy(ptr, src, 4*fix_size);
   }
 
   src->m_header_bits= bits & 

--- 1.41/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-04-28 01:03:32 +02:00
+++ 1.42/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-04-28 01:03:32 +02:00
@@ -970,7 +970,8 @@
     regTabPtr->m_offsets[MM].m_disk_ref_offset= pos[MM] - Disk_part_ref::SZ32;
   }
 
-  if (regTabPtr->m_attributes[MM].m_no_of_varsize)
+  if (regTabPtr->m_attributes[MM].m_no_of_varsize ||
+      regTabPtr->m_attributes[MM].m_no_of_dynamic)
   {
     pos[MM] += Var_part_ref::SZ32;
   }