bzr commit into mysql-5.1 branch (tomas.ulin:3068)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.4/

 3068 Tomas Ulin	2008-11-13
      correct error insert code
modified:
  storage/ndb/src/kernel/blocks/ERROR_codes.txt
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/ERROR_codes.txt'
--- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-11-11 21:09:44 +0000
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-11-13 14:16:21 +0000
@@ -6,7 +6,7 @@ Next DBTUP 4029
 Next DBLQH 5051
 Next DBDICT 6013
 Next DBDIH 7215
-Next DBTC 8065
+Next DBTC 8073
 Next CMVMI 9000
 Next BACKUP 10041
 Next DBUTIL 11002
@@ -251,7 +251,8 @@ Delay execution of ABORTREQ signal 2 sec
 5041: Crash is receiving simple read from other TC on different node
 
 8050: Send TCKEYREF is operation is non local
-8064: Send TCKEYREF is unique index operation is non local
+8071: Send TCKEYREF is unique index operation is non local
+8072: 8050 || 8071
 
 5100,5101: Drop ABORT req in primary replica
            Crash on "next" ABORT

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-11-11 21:09:44 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-11-13 14:16:21 +0000
@@ -3041,9 +3041,9 @@ void Dbtc::tckeyreq050Lab(Signal* signal
     return;
   }
   
-  if(ERROR_INSERTED(8064) && signal->theData[3] != getOwnNodeId() &&
-     DictTabInfo::isUniqueIndex(localTabptr.p->tableType) &&
-     regTcPtr->isIndexOp(regTcPtr->m_special_op_flags))
+  if((ERROR_INSERTED(8071) || ERROR_INSERTED(8072)) &&
+     (regTcPtr->m_special_op_flags & TcConnectRecord::SOF_INDEX_TABLE_READ) &&
+     signal->theData[3] != getOwnNodeId())
   {
     ndbassert(false);
     signal->theData[1] = 626;
@@ -3051,7 +3051,10 @@ void Dbtc::tckeyreq050Lab(Signal* signal
     return;
   }
 
-  if(ERROR_INSERTED(8050) && signal->theData[3] != getOwnNodeId())
+  if((ERROR_INSERTED(8050) || ERROR_INSERTED(8072)) &&
+     refToBlock(regApiPtr->ndbapiBlockref) != DBUTIL &&
+     regTcPtr->m_special_op_flags == 0 &&
+     signal->theData[3] != getOwnNodeId())
   {
     ndbassert(false);
     signal->theData[1] = 626;