bk commit into 5.0 tree (mskold:1.2495) BUG#21072

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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, 2007-12-07 10:33:50+01:00, mskold@stripped +3 -0
  bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-12-07 10:33:45+01:00,
mskold@stripped +1 -5
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2007-12-07 10:33:45+01:00, mskold@stripped +0
-1
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  sql/ha_ndbcluster.cc@stripped, 2007-12-07 10:33:45+01:00, mskold@stripped +0 -2
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

# 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:	mskold
# Host:	quadfish.(none)
# Root:	/home/marty/MySQL/mysql-5.0-ndb

--- 1.115/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-12-06 17:15:10 +01:00
+++ 1.116/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-12-07 10:33:45 +01:00
@@ -5162,7 +5162,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
         TcIndexData* indexData = c_theIndexes.getPtr(currentIndexId);
         indexId = indexData->indexId;
         regApiPtr->errorData = indexId;
-        ndbout_c("LQHKEYREF, found index %u", indexId);
 	const Uint32 opType = regTcPtr->operation;
 	if (errCode == ZALREADYEXIST)
 	  errCode = terrorCode = ZNOTUNIQUE;
@@ -5246,7 +5245,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
         jam();
 	regApiPtr->lqhkeyreqrec--; // Compensate for extra during read
 	tcKeyRef->connectPtr = indexOp;
-        ndbout_c("TCKEYREF, sending index %u", indexId);
         tcKeyRef->errorData = indexId;
 	EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength);
 	apiConnectptr.i = save;
@@ -5254,7 +5252,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
       } else {
         jam();
 	tcKeyRef->connectPtr = clientData;
-        ndbout_c("TCKEYREF, sending index %u", indexId);
         tcKeyRef->errorData = indexId;
 	sendSignal(regApiPtr->ndbapiBlockref, 
 		   GSN_TCKEYREF, signal, TcKeyRef::SignalLength, JBB);
@@ -12234,7 +12231,7 @@ void Dbtc::execTRANSID_AI(Signal* signal
     tcIndxRef->transId[0] = regApiPtr->transid[0];
     tcIndxRef->transId[1] = regApiPtr->transid[1];
     tcIndxRef->errorCode = 4349;
-    // tcIndxRef->errorData = ??; Where to find indexId
+    tcIndxRef->errorData = regApiPtr->errorData;
     sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal, 
 	       TcKeyRef::SignalLength, JBB);
     return;
@@ -13030,7 +13027,6 @@ void Dbtc::insertIntoIndexTable(Signal* 
   }
 
   regApiPtr->currSavePointId = currSavePointId;
-  ndbout_c("TCKEYREQ, saving index %u", indexData->indexId);
   tcConnectptr.p->currentIndexId = indexData->indexId;
 
   // *********** KEYINFO ***********

--- 1.61/ndb/src/ndbapi/NdbTransaction.cpp	2007-12-06 17:15:10 +01:00
+++ 1.62/ndb/src/ndbapi/NdbTransaction.cpp	2007-12-07 10:33:45 +01:00
@@ -1769,7 +1769,6 @@ transactions.
     theError.code = aSignal->readData(4);// Override any previous errors
     if (aSignal->getLength() == TcRollbackRep::SignalLength)
     {
-      DBUG_PRINT("info", ("Found error data %u", aSignal->readData(5)));
       // Signal may contain additional error data
       theError.details = (char *) aSignal->readData(5);
     }

--- 1.323/sql/ha_ndbcluster.cc	2007-12-06 17:15:11 +01:00
+++ 1.324/sql/ha_ndbcluster.cc	2007-12-07 10:33:45 +01:00
@@ -543,7 +543,6 @@ int ha_ndbcluster::ndb_err(NdbTransactio
     uint error_data= (uint) err.details;
     uint dupkey= MAX_KEY;
 
-    DBUG_PRINT("info", ("HA_ERR_FOUND_DUPP_KEY, index table %u", error_data));
     for (uint i= 0; i < MAX_KEY; i++)
     {
       if (m_index[i].type == UNIQUE_INDEX || 
@@ -555,7 +554,6 @@ int ha_ndbcluster::ndb_err(NdbTransactio
             unique_index->getIndexTable() &&
             (uint) unique_index->getIndexTable()->getTableId() == error_data)
         {
-          DBUG_PRINT("info", ("Found violated key %u", i));
           dupkey= i;
           break;
         }