MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:September 21 2009 12:11pm
Subject:bzr commit into mysql-5.1-telco-6.3 branch (jonas:3057)
View as plain text  
#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3057 Jonas Oreland	2009-09-21
      ndb - fix bug in previous bug-fix, make sure to reset dynTabDescriptor to RNIL after release

    modified:
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2009-09-21 12:11:14 +0000
@@ -670,6 +670,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 10:52:41 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2009-09-21 12:11:14 +0000
@@ -703,6 +703,8 @@ Dbtup::handleAlterTabPrepare(Signal *sig
   regAlterTabOpPtr.p->newNoOfAttrs= newNoOfAttr;
   regAlterTabOpPtr.p->newNoOfCharsets= newNoOfCharsets;
   regAlterTabOpPtr.p->newNoOfKeyAttrs= newNoOfKeyAttrs;
+  regAlterTabOpPtr.p->tableDescriptor = RNIL;
+  regAlterTabOpPtr.p->dynTableDescriptor = RNIL;
 
   /* Allocate a new (possibly larger) table descriptor buffer. */
   Uint32 allocSize= getTabDescrOffsets(newNoOfAttr, newNoOfCharsets,
@@ -1548,6 +1550,7 @@ void Dbtup::releaseTabDescr(Tablerec* co
   }
 
   releaseTabDescr(regTabPtr->dynTabDescriptor);
+  regTabPtr->dynTabDescriptor = RNIL;
 }
 
 void Dbtup::releaseFragment(Signal* signal, Uint32 tableId, 


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20090921121114-q12zzopiw4miu8yj.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (jonas:3057)Jonas Oreland21 Sep