bzr commit into mysql-5.1-telco-7.0 branch (jonas:4388) Bug#60484

[Jonas Oreland]

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

 4388 Jonas Oreland	2011-05-17
      ndb - bug#60484 - fix problem seen by testDict -n DictRestart (autotest) with marking/unmarking of m_newTable_realObjectId

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-05-12 09:01:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-05-17 13:09:45 +0000
@@ -3914,6 +3914,7 @@ Dbdict::checkPendingSchemaTrans(XSchemaF
         }
       }
 
+      transEntry->m_tableType = DictTabInfo::UndefTableType;
       transEntry->m_tableState = SchemaFile::SF_UNUSED;
       transEntry->m_transId = 0;
     }
@@ -9487,7 +9488,7 @@ Dbdict::alterTable_fromCommitComplete(Si
     // Remark object as free
     SchemaFile::TableEntry * objEntry =
       objEntry = getTableEntry(alterTabPtr.p->m_newTable_realObjectId);
-    objEntry->m_tableType = DictTabInfo::SchemaTransaction;
+    objEntry->m_tableType = DictTabInfo::UndefTableType;
     objEntry->m_tableState = SchemaFile::SF_UNUSED;
     objEntry->m_transId = 0;
   }
@@ -9579,7 +9580,7 @@ Dbdict::alterTable_abortParse(Signal* si
       // Remark object as free
       SchemaFile::TableEntry * objEntry =
         objEntry = getTableEntry(alterTabPtr.p->m_newTable_realObjectId);
-      objEntry->m_tableType = DictTabInfo::SchemaTransaction;
+      objEntry->m_tableType = DictTabInfo::UndefTableType;
       objEntry->m_tableState = SchemaFile::SF_UNUSED;
       objEntry->m_transId = 0;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]