List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:December 21 2010 10:24am
Subject:bzr commit into mysql-5.1-telco-7.0-llcp branch (jonas:3687)
View as plain text  
#At file:///home/jonas/src/70-jonas/ based on revid:jonas@stripped

 3687 Jonas Oreland	2010-12-21
      ndb - don't propagate force-lcp when using llcp

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-12-20 12:57:34 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-12-21 10:24:28 +0000
@@ -18285,7 +18285,8 @@ Dbdih::execDUMP_STATE_ORD(Signal* signal
      * If sent from local LQH, forward to master
      */
     if (cmasterNodeId != getOwnNodeId() &&
-        refToMain(signal->getSendersBlockRef()) == DBLQH)
+        refToMain(signal->getSendersBlockRef()) == DBLQH &&
+        !c_lcpState.m_local_lcp)
     {
       jam();
       sendSignal(cmasterdihref, GSN_DUMP_STATE_ORD, signal, 1, JBB);


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20101221102428-9nxnysgbjbbtzw6e.bundle
Thread
bzr commit into mysql-5.1-telco-7.0-llcp branch (jonas:3687) Jonas Oreland21 Dec