bzr commit into mysql-5.1-telco-6.3 branch (jonas:3070)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:magnus.blaudd@stripped

 3070 Jonas Oreland	2009-09-29
      ndb - improve back-off on temporary errors in scan...hopefully fixes testScan -n ScanRead488_Mixed

    modified:
      storage/ndb/test/src/HugoTransactions.cpp
=== modified file 'storage/ndb/test/src/HugoTransactions.cpp'
--- a/storage/ndb/test/src/HugoTransactions.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/test/src/HugoTransactions.cpp	2009-09-29 12:32:13 +0000
@@ -326,6 +326,19 @@ HugoTransactions::scanReadRecords(Ndb* p
               parallelism = 1;
               ndbout_c("decrease parallelism");
             }
+            else if (retryAttempt >= (m_retryMax / 5) &&
+                     (lm != NdbOperation::LM_CommittedRead))
+            {
+              lm = NdbOperation::LM_CommittedRead;
+              ndbout_c("switch to LM_CommittedRead");
+            }
+            else if (retryAttempt >= (m_retryMax / 4) &&
+                     (pIdx != 0))
+            {
+              pIdx = 0;
+              scan_flags |= NdbScanOperation::SF_TupScan;
+              ndbout_c("switch to table-scan (SF_TupScan) form index-scan");
+            }
           }
 	  retryAttempt++;
 	}


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