bk commit into 5.1 tree (jonas:1.2519) BUG#20535

[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-05-08 16:10:38+02:00, jonas@stripped +2 -0
  ndb - bug#20535
    also handle dynamic attributes

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-05-08 16:10:35+02:00,
jonas@stripped +9 -0
    also handle dynamic attributes

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2007-05-08 16:10:36+02:00,
jonas@stripped +5 -1
    also handle dynamic attributes

# 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.85/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-05-08 16:10:43 +02:00
+++ 1.86/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-05-08 16:10:43 +02:00
@@ -1277,6 +1277,15 @@
       memset(req_struct->m_disk_ptr->m_null_bits+
              regTabPtr->m_offsets[DD].m_null_offset, 0xFF, 
              4*regTabPtr->m_offsets[DD].m_null_words);
+
+      Uint32 bm_size_in_bytes= 4*(regTabPtr->m_offsets[MM].m_dyn_null_words);
+      if (bm_size_in_bytes)
+      {
+        Uint32* ptr = 
+          (Uint32*)req_struct->m_var_data[MM].m_dyn_data_ptr;
+        bzero(ptr, bm_size_in_bytes);
+        * ptr = bm_size_in_bytes >> 2;
+      }
     } 
     else
     {

--- 1.46/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-05-08 16:10:43 +02:00
+++ 1.47/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-05-08 16:10:43 +02:00
@@ -940,7 +940,11 @@
 void
 Dbtup::computeTableMetaData(Tablerec *regTabPtr)
 {
-
+  if (regTabPtr->m_dyn_null_bits == DYN_BM_LEN_BITS)
+  {
+    regTabPtr->m_dyn_null_bits = 0;
+  }
+  
   Uint32 dyn_null_words= (regTabPtr->m_dyn_null_bits+31)>>5;
   regTabPtr->m_offsets[MM].m_dyn_null_words= dyn_null_words;