bk commit into 5.1 tree (jonas:1.2297)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-09-26 14:08:20+02:00, jonas@stripped +3 -0
  ndb - post merge fixes...

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-09-26 14:08:18+02:00,
jonas@stripped +1 -1
    merge

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2006-09-26 14:08:18+02:00,
jonas@stripped +1 -1
    merge

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-09-26 14:08:18+02:00,
jonas@stripped +1 -1
    merge

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.99/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-09-26 14:08:24 +02:00
+++ 1.100/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-09-26 14:08:24 +02:00
@@ -2877,7 +2877,7 @@
 	// On NR get index from master because index state is not on file
 	Uint32 type= oldEntry->m_tableType;
         const bool file = (* newEntry == * oldEntry) &&
-	          (c_systemRestart || !DictTabInfo::isIndex(type);
+	  (c_systemRestart || !DictTabInfo::isIndex(type));
 	newEntry->m_info_words= oldEntry->m_info_words;
 	restartCreateTab(signal, tableId, oldEntry, newEntry, file);
 	return;

--- 1.124/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-09-26 14:08:24 +02:00
+++ 1.125/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-09-26 14:08:24 +02:00
@@ -18344,7 +18344,7 @@
 	  FragrecordPtr fragPtr;
 	  if ((fragPtr.i = tabPtr.p->fragrec[j]) != RNIL)
 	  {
-	    ptrCheckGuard(fragPtr, cfragrecFileSize, fragrecord);
+	    c_fragment_pool.getPtr(fragPtr);
 	    infoEvent("  frag: %d distKey: %u", 
 		      tabPtr.p->fragid[j],
 		      fragPtr.p->fragDistributionKey);

--- 1.58/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-09-26 14:08:24 +02:00
+++ 1.59/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-09-26 14:08:24 +02:00
@@ -977,7 +977,7 @@
 Remark:         Release scan op when hupp'ed trans closed (save memory)
 ******************************************************************************/
 void 
-NdbTransaction::releaseScanOperation(NdbIndexScanOperation* cursorOp)
+NdbTransaction::releaseExecutedScanOperation(NdbIndexScanOperation* cursorOp)
 {
   DBUG_ENTER("NdbTransaction::releaseExecutedScanOperation");
   DBUG_PRINT("enter", ("this=0x%x op=0x%x", (UintPtr)this, (UintPtr)cursorOp));