bzr commit into mysql-5.1-telco-7.0 branch (jonas:4286)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4286 Jonas Oreland	2011-04-06
      ndb - fix testLimits -n ExhaustSegmentedSectionIx WIDE_2COL_IX

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-04-01 07:10:05 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-04-06 14:46:42 +0000
@@ -13957,6 +13957,10 @@ bool Dbtc::receivedAllINDXATTRINFO(TcInd
   return (indexOp->pendingAttrInfo == 0);
 }
 
+#ifdef ERROR_INSERT
+extern bool ErrorImportActive;
+#endif
+
 bool  Dbtc::saveTRANSID_AI(Signal* signal,
 			   TcIndexOperation* indexOp, 
                            const Uint32 *src,
@@ -14035,9 +14039,22 @@ bool  Dbtc::saveTRANSID_AI(Signal* signa
     {
       jam();
       /* Add key information to long section */
-      if (appendToSection(indexOp->transIdAISectionIVal,
-                          src,
-                          remain))
+#ifdef ERROR_INSERT
+      if (ERROR_INSERTED(8066))
+      {
+        ErrorImportActive = true;
+      }
+#endif
+
+      bool res = appendToSection(indexOp->transIdAISectionIVal, src, remain);
+#ifdef ERROR_INSERT
+      if (ERROR_INSERTED(8066))
+      {
+        ErrorImportActive = false;
+      }
+#endif
+
+      if (res)
       {
         jam();
         remain= 0;


Attachment: [text/bzr-bundle] bzr/[e-mail]