From: Jonas Oreland
Date: September 21 2009 12:17pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (jonas:3019)
List-Archive: http://lists.mysql.com/commits/83916
Message-Id: <20090921121801.D91FD99318A@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_KtqJ6G/ZbcojM7MAIKHeGA)"

--Boundary_(ID_KtqJ6G/ZbcojM7MAIKHeGA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/jonas/src/telco-7.1/ based on revid:jonas@stripped

 3019 Jonas Oreland	2009-09-21 [merge]
      merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2009-09-09 11:04:27 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2009-09-21 12:17:44 +0000
@@ -752,6 +752,7 @@ Dbtup::initTab(Tablerec* const regTabPtr
 
   regTabPtr->tabDescriptor = RNIL;
   regTabPtr->readKeyArray = RNIL;
+  regTabPtr->dynTabDescriptor = RNIL;
 
   regTabPtr->m_bits = 0;
 

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2009-09-16 13:54:07 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2009-09-21 12:17:44 +0000
@@ -1762,12 +1762,7 @@ void Dbtup::releaseTabDescr(Tablerec* co
 
     // move to start of descriptor
     descriptor -= offset[3];
-    Uint32 retNo= getTabDescrWord(descriptor + ZTD_DATASIZE);
-    ndbrequire(getTabDescrWord(descriptor + ZTD_HEADER) == ZTD_TYPE_NORMAL);
-    ndbrequire(retNo == getTabDescrWord((descriptor + retNo) - ZTD_TR_SIZE));
-    ndbrequire(ZTD_TYPE_NORMAL ==
-               getTabDescrWord((descriptor + retNo) - ZTD_TR_TYPE));
-    freeTabDescr(descriptor, retNo);
+    releaseTabDescr(descriptor);
   }
 
   descriptor= regTabPtr->dynTabDescriptor;
@@ -1777,12 +1772,7 @@ void Dbtup::releaseTabDescr(Tablerec* co
     regTabPtr->dynTabDescriptor= RNIL;
     regTabPtr->dynVarSizeMask= NULL;
     regTabPtr->dynFixSizeMask= NULL;
-    Uint32 retNo= getTabDescrWord(descriptor + ZTD_DATASIZE);
-    ndbrequire(getTabDescrWord(descriptor + ZTD_HEADER) == ZTD_TYPE_NORMAL);
-    ndbrequire(retNo == getTabDescrWord((descriptor + retNo) - ZTD_TR_SIZE));
-    ndbrequire(ZTD_TYPE_NORMAL ==
-               getTabDescrWord((descriptor + retNo) - ZTD_TR_TYPE));
-    freeTabDescr(descriptor, retNo);
+    releaseTabDescr(descriptor);
   }
 }
 

=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2009-09-16 13:54:07 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2009-09-21 12:17:44 +0000
@@ -7012,6 +7012,7 @@ runBug41905getTable(NDBT_Context* ctx, N
   }
 
 out:
+  (void)pDic->dropTable(tabName.c_str());
   return NDBT_OK;
 }
 


--Boundary_(ID_KtqJ6G/ZbcojM7MAIKHeGA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jonas@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.1/
# testament_sha1: 88ed9d381754e1c8cf4387f738761bb7a48d1e6a
# timestamp: 2009-09-21 14:18:01 +0200
# source_branch: file:///home/jonas/src/71-local/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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


--Boundary_(ID_KtqJ6G/ZbcojM7MAIKHeGA)--