bzr push into mysql-5.1-telco-7.1 branch (jonas:3036 to 3038)

[Jonas Oreland]

 3038 Jonas Oreland	2009-09-29 [merge]
      merge 70 to 71

 3037 Jonas Oreland	2009-09-29 [merge]
      merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/test/src/HugoTransactions.cpp
 3036 Magnus Blåudd	2009-09-28 [merge]
      Merge bug#42805

    modified:
      mysys/my_thr_init.c
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-23 08:09:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-09-29 13:23:26 +0000
@@ -3319,7 +3319,7 @@ void Dblqh::sendCommitLqh(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tdata[4] == 0 || getNodeInfo(Thostptr.i).m_connected == false);
+    ndbassert(Tdata[4] == 0 || getNodeInfo(Thostptr.i).m_version == 0);
     len = 4;
   }
 

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-09-21 08:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-09-29 13:23:26 +0000
@@ -4595,7 +4595,7 @@ void Dbtc::sendCommitLqh(Signal* signal,
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(Thostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tdata[4] == 0 || getNodeInfo(Thostptr.i).m_connected == false);
+    ndbassert(Tdata[4] == 0 || getNodeInfo(Thostptr.i).m_version == 0);
     len = 4;
   }
 
@@ -12808,7 +12808,7 @@ void Dbtc::sendTcIndxConf(Signal* signal
   if (unlikely(!ndb_check_micro_gcp(getNodeInfo(localHostptr.i).m_version)))
   {
     jam();
-    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_connected == false);
+    ndbassert(Tpack6 == 0 || getNodeInfo(localHostptr.i).m_version == 0);
   }
 }//Dbtc::sendTcIndxConf()
 

=== 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]