bk commit into 5.1 tree (knielsen:1.2538)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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-21 17:27:05+02:00, knielsen@ymer.(none) +2 -0
  Fix typo bug causing wrong storage method for big fixed-size dynamic columns.

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2007-05-21 17:26:56+02:00, knielsen@ymer.(none) +5 -4
    Fix typo bug causing wrong storage method for big fixed-size dynamic columns.

  storage/ndb/test/src/NDBT_Tables.cpp@stripped, 2007-05-21 17:26:56+02:00, knielsen@ymer.(none) +1 -1
    Switch column storage type to also test big fixed-size 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-5.1-telco-ndbrecord

--- 1.41/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-05-21 17:27:14 +02:00
+++ 1.42/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-05-21 17:27:14 +02:00
@@ -40,6 +40,7 @@ Dbtup::setUpQueryRoutines(Tablerec *regT
     Uint32 charset = AttributeOffset::getCharsetFlag(attrOffset);
     Uint32 size = AttributeDescriptor::getSize(attrDescr);
     Uint32 bytes = AttributeDescriptor::getSizeInBytes(attrDescr);
+    Uint32 words = AttributeDescriptor::getSizeInWords(attrDescr);
     Uint32 nullable = AttributeDescriptor::getNullable(attrDescr);
     Uint32 dynamic = AttributeDescriptor::getDynamic(attrDescr);
 
@@ -212,13 +213,13 @@ Dbtup::setUpQueryRoutines(Tablerec *regT
       {
         if (array == NDB_ARRAYTYPE_FIXED)
         {
-          if (size == 0)
+          if (words == 0)
           {
             jam(); 
             regTabPtr->readFunctionArray[i]= &Dbtup::readDynBitsNULLable;
             regTabPtr->updateFunctionArray[i]= &Dbtup::updateDynBitsNULLable;
           } 
-          else if (size > InternalMaxDynFix) 
+          else if (words > InternalMaxDynFix) 
           {
             jam();
             regTabPtr->readFunctionArray[i]= 
@@ -245,13 +246,13 @@ Dbtup::setUpQueryRoutines(Tablerec *regT
       {
         if (array == NDB_ARRAYTYPE_FIXED)
         {
-          if (size == 0)
+          if (words == 0)
           {
             jam(); 
             regTabPtr->readFunctionArray[i]= &Dbtup::readDynBitsNotNULL;
             regTabPtr->updateFunctionArray[i]= &Dbtup::updateDynBitsNotNULL;
           } 
-          else if (size > InternalMaxDynFix) 
+          else if (words > InternalMaxDynFix) 
           {
             jam();
             regTabPtr->readFunctionArray[i]= 

--- 1.25/storage/ndb/test/src/NDBT_Tables.cpp	2007-05-21 17:27:14 +02:00
+++ 1.26/storage/ndb/test/src/NDBT_Tables.cpp	2007-05-21 17:27:14 +02:00
@@ -288,7 +288,7 @@ NDBT_Attribute T14Attribs[] = {
   NDBT_Attribute("KOL20", NdbDictionary::Column::Unsigned),
   NDBT_Attribute("KOL30", NdbDictionary::Column::Int),
   NDBT_Attribute("KOL40", NdbDictionary::Column::Float),
-  NDBT_Attribute("KOL50", NdbDictionary::Column::Char, 200)
+  NDBT_Attribute("KOL50", NdbDictionary::Column::Char, 200, false, false, 0, MM, true)
 };