List:Commits« Previous MessageNext Message »
From:jonas oreland Date:November 17 2011 8:06pm
Subject:bzr push into mysql-5.1-telco-7.0-trpman branch (jonas.oreland:4675 to 4676)
View as plain text  
 4676 jonas oreland	2011-11-17
      70 - trpman - continue trial/error searching for bug - attempt 3

    modified:
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
 4675 jonas oreland	2011-11-17
      70 - trpman - continue trial/error searching for bug

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2011-11-16 16:23:37 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2011-11-17 20:03:58 +0000
@@ -1030,7 +1030,7 @@ Configuration::setLockCPU(NdbThread * pT
   }
   else if (!NdbIsMultiThreaded())
   {
-    BlockNumber list[] = { CMVMI };
+    BlockNumber list[] = { DBDIH };
     res = m_thr_config.do_bind(pThread, list, 1);
   }
 

=== modified file 'storage/ndb/src/kernel/vm/mt_thr_config.cpp'
--- a/storage/ndb/src/kernel/vm/mt_thr_config.cpp	2011-11-16 16:23:37 +0000
+++ b/storage/ndb/src/kernel/vm/mt_thr_config.cpp	2011-11-17 20:03:58 +0000
@@ -928,10 +928,6 @@ THRConfigApplier::find_thread(const unsi
   {
     return &m_threads[T_REP][instanceNo];
   }
-  else if ((instanceNo = findBlock(CMVMI, instancelist, cnt)) >= 0)
-  {
-    return &m_threads[T_RECV][instanceNo];
-  }
   else if ((instanceNo = findBlock(DBDIH, instancelist, cnt)) >= 0)
   {
     return &m_threads[T_MAIN][instanceNo];
@@ -944,6 +940,10 @@ THRConfigApplier::find_thread(const unsi
   {
     return &m_threads[T_LDM][instanceNo - 1]; // remove proxy...
   }
+  else if ((instanceNo = findBlock(TRPMAN, instancelist, cnt)) >= 0)
+  {
+    return &m_threads[T_RECV][instanceNo - 1]; // remove proxy
+  }
   return 0;
 }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0-trpman branch (jonas.oreland:4675 to 4676)jonas oreland18 Nov