bzr push into mysql-5.1-telco-7.0 branch (jonas:3677 to 3679)

[Jonas Oreland]

 3679 Jonas Oreland	2010-08-20
      ndb - revert removal of one mutex...we need to keep mutex...(for parallel node restart)

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 3678 Jonas Oreland	2010-08-20
      ndb - revert debug_redo default on

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 3677 Jonas Oreland	2010-08-19
      ndb - forgot to add new -tests.txt file to DIST

    modified:
      storage/ndb/test/run-test/Makefile.am
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-08-18 07:05:54 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2010-08-20 06:30:38 +0000
@@ -2570,17 +2570,8 @@ Dbdih::startme_copygci_conf(Signal* sign
   Callback c = { safe_cast(&Dbdih::lcpBlockedLab),
                  c_nodeStartMaster.startNode };
 
-  if (!c_lcpState.m_local_lcp)
-  {
-    jam();
-    Mutex mutex(signal, c_mutexMgr, c_nodeStartMaster.m_fragmentInfoMutex);
-    mutex.lock(c, true, true);
-  }
-  else
-  {
-    jam();
-    execute(signal, c, 0);
-  }
+  Mutex mutex(signal, c_mutexMgr, c_nodeStartMaster.m_fragmentInfoMutex);
+  mutex.lock(c, true, true);
 }
 
 void Dbdih::lcpBlockedLab(Signal* signal, Uint32 nodeId, Uint32 retVal)
@@ -2796,20 +2787,17 @@ void Dbdih::execINCL_NODECONF(Signal* si
   signal->theData[0] = DihContinueB::ZSTART_GCP;
   sendSignal(reference(), GSN_CONTINUEB, signal, 1, JBB);
 
-  if (!c_lcpState.m_local_lcp)
-  {
-    /**
-     * To increase likelyhood that multiple nodes starting simulatanious
-     *   gets to copy fragment-info before a new LCP is started
-     *   we delay the releasing of this mutex. So that node that (might)
-     *   be started when GSN_START_PERMREP arrives will get mutex
-     *   before LCP (which does trylock for 60s)
-     */
-    signal->theData[0] = DihContinueB::ZDELAY_RELEASE_FRAGMENT_INFO_MUTEX;
-    signal->theData[1] = c_nodeStartMaster.m_fragmentInfoMutex.getHandle();
-    c_nodeStartMaster.m_fragmentInfoMutex.clear();
-    sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 500, 2);
-  }
+  /**
+   * To increase likelyhood that multiple nodes starting simulatanious
+   *   gets to copy fragment-info before a new LCP is started
+   *   we delay the releasing of this mutex. So that node that (might)
+   *   be started when GSN_START_PERMREP arrives will get mutex
+   *   before LCP (which does trylock for 60s)
+   */
+  signal->theData[0] = DihContinueB::ZDELAY_RELEASE_FRAGMENT_INFO_MUTEX;
+  signal->theData[1] = c_nodeStartMaster.m_fragmentInfoMutex.getHandle();
+  c_nodeStartMaster.m_fragmentInfoMutex.clear();
+  sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 500, 2);
 }//Dbdih::execINCL_NODECONF()
 
 void Dbdih::execUNBLO_DICTCONF(Signal* signal) 

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-08-19 08:12:48 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-08-20 06:21:50 +0000
@@ -155,14 +155,14 @@ operator<<(NdbOut& out, Operation_t op)
 //#define MARKER_TRACE 0
 //#define TRACE_SCAN_TAKEOVER 1
 
-#if defined VM_TRACE || defined ERROR_INSERT
+#ifdef VM_TRACE
 #ifndef NDB_DEBUG_REDO
 #define NDB_DEBUG_REDO
 #endif
 #endif
 
 #ifdef NDB_DEBUG_REDO
-static int DEBUG_REDO = 1;
+static int DEBUG_REDO = 0;
 #else
 #define DEBUG_REDO 0
 #endif


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