bk commit into 5.1 tree (pekka:1.2271)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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, 2006-07-26 20:40:20+02:00, pekka@stripped +2 -0
  Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51
  into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
  MERGE: 1.2256.1.2

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2006-07-26 20:39:55+02:00, pekka@stripped +0 -1
    manual
    MERGE: 1.22.1.1

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2006-07-26 20:37:01+02:00, pekka@stripped +0 -0
    Auto merged
    MERGE: 1.47.1.1

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space_old/pekka/ndb/version/my51-bug14935/RESYNC

--- 1.23/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2006-07-26 20:40:38 +02:00
+++ 1.24/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2006-07-26 20:40:38 +02:00
@@ -437,6 +437,8 @@
 8036: Fail next index drop in TC
 6006: Crash participant in create index
 
+4013: verify TUP tab descr before and after next DROP TABLE
+
 System Restart:
 ---------------
 

--- 1.49/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2006-07-26 20:40:38 +02:00
+++ 1.50/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2006-07-26 20:40:38 +02:00
@@ -2376,15 +2376,18 @@
 // Public methods
   Uint32 getTabDescrOffsets(const Tablerec* regTabPtr, Uint32* offset);
   Uint32 allocTabDescr(const Tablerec* regTabPtr, Uint32* offset);
-  void freeTabDescr(Uint32 retRef, Uint32 retNo);
+  void freeTabDescr(Uint32 retRef, Uint32 retNo, bool normal = true);
   Uint32 getTabDescrWord(Uint32 index);
   void setTabDescrWord(Uint32 index, Uint32 word);
 
 // Private methods
   Uint32 sizeOfReadFunction();
   void   removeTdArea(Uint32 tabDesRef, Uint32 list);
-  void   insertTdArea(Uint32 sizeOfChunk, Uint32 tabDesRef, Uint32 list);
-  Uint32 itdaMergeTabDescr(Uint32 retRef, Uint32 retNo);
+  void   insertTdArea(Uint32 tabDesRef, Uint32 list);
+  void   itdaMergeTabDescr(Uint32& retRef, Uint32& retNo, bool normal);
+#ifdef VM_TRACE
+  void verifytabdes();
+#endif
 
   void seizeOpRec(OperationrecPtr& regOperPtr);
   void seizeFragrecord(FragrecordPtr& regFragPtr);