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

[Tomas Ulin]

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

 3067 Tomas Ulin	2008-11-11
      add error insert
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-10-29 09:15:35 +0000
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-11-11 21:09:44 +0000
@@ -6,7 +6,7 @@ Next DBTUP 4029
 Next DBLQH 5051
 Next DBDICT 6013
 Next DBDIH 7215
-Next DBTC 8064
+Next DBTC 8065
 Next CMVMI 9000
 Next BACKUP 10041
 Next DBUTIL 11002
@@ -251,6 +251,7 @@ 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
 
 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-07 11:00:38 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-11-11 21:09:44 +0000
@@ -3041,6 +3041,16 @@ 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))
+  {
+    ndbassert(false);
+    signal->theData[1] = 626;
+    execDIGETNODESREF(signal);
+    return;
+  }
+
   if(ERROR_INSERTED(8050) && signal->theData[3] != getOwnNodeId())
   {
     ndbassert(false);