bk commit into 5.1 tree (tomas:1.2082) BUG#16152

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2082 06/01/26 11:14:20 tomas@stripped +4 -0
   Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
    1.6 06/01/26 11:14:13 tomas@stripped +0 -1
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
    1.16 06/01/26 11:14:13 tomas@stripped +5 -14
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
    1.3 06/01/26 11:14:13 tomas@stripped +4 -4
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/include/kernel/signaldata/UtilExecute.hpp
    1.3 06/01/26 11:14:13 tomas@stripped +2 -3
     Bug #16152, create event assertion in debug version, list corruption

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql51

--- 1.2/storage/ndb/include/kernel/signaldata/UtilExecute.hpp	2005-04-08 02:43:52 +02:00
+++ 1.3/storage/ndb/include/kernel/signaldata/UtilExecute.hpp	2006-01-26 11:14:13 +01:00
@@ -49,9 +49,9 @@
   GET_SET_SENDERREF
   GET_SET_SENDERDATA
   void setPrepareId(Uint32 pId) { prepareId = pId; }; // !! unsets release flag
-  Uint32 getPrepareId() { return prepareId & 0xFF; };
+  Uint32 getPrepareId() const { return prepareId & 0xFF; };
   void setReleaseFlag() { prepareId |= 0x100; };
-  bool getReleaseFlag() { return (prepareId & 0x100) != 0; };
+  bool getReleaseFlag() const { return (prepareId & 0x100) != 0; };
 private:
   Uint32 senderData; // MUST be no 1!
   Uint32 senderRef;
@@ -117,7 +117,6 @@
     IllegalKeyNumber = 1,
     IllegalAttrNumber = 2,
     TCError = 3,
-    IllegalPrepareId = 4,
     AllocationError = 5,
     MissingDataSection = 6,
     MissingData = 7

--- 1.2/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp	2005-04-08 02:43:56 +02:00
+++ 1.3/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp	2006-01-26 11:14:13 +01:00
@@ -20,10 +20,12 @@
 printUTIL_EXECUTE_REQ(FILE* out, const Uint32 * data, Uint32 len, Uint16 rec) 
 {
   const UtilExecuteReq* const sig = (UtilExecuteReq*)data;
-  fprintf(out, " senderRef: H'%.8x, senderData: H'%.8x prepareId: %d\n",
+  fprintf(out, " senderRef: H'%.8x, senderData: H'%.8x prepareId: %d "
+          " releaseFlag: %d\n",
 	  sig->senderRef,
 	  sig->senderData,
-	  sig->prepareId);
+	  sig->getPrepareId(),
+          sig->getReleaseFlag());
   return true;
 }
 
@@ -48,8 +50,6 @@
 	  "IllegalAttrNumber" : 
 	  sig->errorCode == UtilExecuteRef::TCError ? 
 	  "TCError" : 
-	  sig->errorCode == UtilExecuteRef::IllegalPrepareId ? 
-	  "IllegalPrepareId" :
 	  sig->errorCode == UtilExecuteRef::AllocationError ? 
 	  "AllocationError" :
 	  "Unknown");

--- 1.15/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2005-11-07 12:19:08 +01:00
+++ 1.16/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2006-01-26 11:14:13 +01:00
@@ -52,7 +52,6 @@
 DbUtil::DbUtil(const Configuration & conf) :
   SimulatedBlock(DBUTIL, conf),
   c_runningPrepares(c_preparePool),
-  c_runningPreparedOperations(c_preparedOperationPool),
   c_seizingTransactions(c_transactionPool),
   c_runningTransactions(c_transactionPool),
   c_lockQueues(c_lockQueuePool)
@@ -566,12 +565,13 @@
 	}
 	ndbout << "PreparedOperation Id: " << signal->theData[2] << endl;
 	PreparedOperationPtr prepOpPtr;
-	c_runningPreparedOperations.getPtr(prepOpPtr, signal->theData[2]);
+	c_preparedOperationPool.getPtr(prepOpPtr, signal->theData[2]);
 	prepOpPtr.p->print();
 	return;
       }
 
       // ** Print all records **
+#if 0 // not implemented
       PreparedOperationPtr prepOpPtr;
       if (!c_runningPreparedOperations.first(prepOpPtr)) {
 	ndbout << "No PreparedOperations exist" << endl;
@@ -583,6 +583,7 @@
 	ndbout << "]";
 	c_runningPreparedOperations.next(prepOpPtr);
       }
+#endif
       return;
 
     case 3:
@@ -988,7 +989,7 @@
    * Seize and store PreparedOperation struct
    *******************************************/
   PreparedOperationPtr prepOpPtr;  
-  if(!c_runningPreparedOperations.seize(prepOpPtr)) {
+  if(!c_preparedOperationPool.seize(prepOpPtr)) {
     jam();
     releaseSections(signal);
     sendUtilPrepareRef(signal, UtilPrepareRef::PREPARED_OPERATION_SEIZE_ERROR,
@@ -1738,17 +1739,7 @@
    * Get PreparedOperation struct
    *******************************/
   PreparedOperationPtr prepOpPtr;
-  c_runningPreparedOperations.first(prepOpPtr);
-  while (!prepOpPtr.isNull() && prepOpPtr.i != prepareId) 
-    c_runningPreparedOperations.next(prepOpPtr);
-  
-  if (prepOpPtr.i != prepareId) {
-    jam();
-    releaseSections(signal);
-    sendUtilExecuteRef(signal, UtilExecuteRef::IllegalPrepareId,
-		       0, clientRef, clientData);
-    return;
-  }
+  c_preparedOperationPool.getPtr(prepOpPtr, prepareId);
 
   prepOpPtr.p->releaseFlag = releaseFlag;
 

--- 1.5/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2005-10-07 01:06:20 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2006-01-26 11:14:13 +01:00
@@ -389,7 +389,6 @@
   DataBuffer<1>::DataBufferPool   c_attrMappingPool;
   DataBuffer<11>::DataBufferPool  c_dataBufPool;
   DLList<Prepare>                 c_runningPrepares;
-  DLList<PreparedOperation>       c_runningPreparedOperations;
   DLList<Transaction>             c_seizingTransactions; // Being seized at TC
   DLList<Transaction>             c_runningTransactions; // Seized and now exec.