bzr commit into mysql-5.1 branch (jonas:2738)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/

 2738 Jonas Oreland	2008-08-27 [merge]
      merge 6.3 to 6.4
modified:
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
  storage/ndb/src/kernel/vm/mt.cpp

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-08-27 15:59:39 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-08-27 20:27:20 +0000
@@ -1760,7 +1760,7 @@ bool TransporterRegistry::connect_client
   bool res = t->connect_client(connect_ndb_mgmd(h));
   if (res == true)
   {
-    performStates[mgm_nodeid] = TransporterRegistry::CONNECTED;
+    performStates[mgm_nodeid] = TransporterRegistry::CONNECTING;
   }
   DBUG_RETURN(res);
 }

=== modified file 'storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp'
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2008-08-22 11:02:38 +0000
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2008-08-27 20:27:20 +0000
@@ -801,6 +801,16 @@ Cmvmi::execSTART_ORD(Signal* signal) {
   if(globalData.theStartLevel == NodeState::SL_NOTHING)
   {
     jam();
+
+    for(unsigned int i = 1; i < MAX_NODES; i++ )
+    {
+      if (getNodeInfo(i).m_type == NodeInfo::MGM)
+      {
+        jam();
+        globalTransporterRegistry.do_connect(i);
+      }
+    }
+
     globalData.theStartLevel = NodeState::SL_CMVMI;
     sendSignal(QMGR_REF, GSN_START_ORD, signal, 1, JBA);
     return ;

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2008-05-29 15:06:11 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2008-08-27 20:27:20 +0000
@@ -268,12 +268,9 @@ Qmgr::execSTART_ORD(Signal* signal)
     case NodeInfo::MGM:
       jam();
       /**
-       * Enable communication to MGM direcly
-       *   by setting ZFAIL_CLOSING (picked up in checkStartInterface)
+       * cmvmi allows ndb_mgmd to connect directly
        */
-      cnt = 3;
-      nodePtr.p->phase = ZFAIL_CLOSING;
-      nodePtr.p->failState = NORMAL;
+      nodePtr.p->phase = ZAPI_INACTIVE;
       break;
     default:
       jam();

=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2008-08-15 11:01:41 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2008-08-27 20:27:20 +0000
@@ -1236,7 +1236,7 @@ trp_callback::reportSendLen(NodeId nodeI
   signal.theData[2] = (bytes/count);
   signal.header.theVerId_signalNumber = GSN_EVENT_REP;
   signal.header.theReceiversBlockNumber = CMVMI;
-  sendprioa(m_send_thr[nodeId],
+  sendlocal(m_send_thr[nodeId],
             &signalT.header, signalT.theData, NULL);
 }
 
@@ -2079,7 +2079,6 @@ mt_receiver_thread_main(void *thr_arg)
   struct thr_repository* rep = &g_thr_repository;
   struct thr_data* selfptr = (struct thr_data *)thr_arg;
   unsigned thr_no = selfptr->m_thr_no;
-  EmulatedJamBuffer thread_jam;
   Uint32& watchDogCounter = selfptr->m_watchdog_counter;
   Uint32 thrSignalId = 0;
 
@@ -2145,7 +2144,6 @@ mt_job_thread_main(void *thr_arg)
   struct thr_repository* rep = &g_thr_repository;
   struct thr_data* selfptr = (struct thr_data *)thr_arg;
   init_thread(selfptr);
-  EmulatedJamBuffer& thread_jam = selfptr->m_jam;
   Uint32& watchDogCounter = selfptr->m_watchdog_counter;
 
   unsigned thr_no = selfptr->m_thr_no;
@@ -2657,7 +2655,6 @@ ThreadConfig::init(EmulatorData *emulato
 
 void ThreadConfig::ipControlLoop(Uint32 thread_index)
 {
-  unsigned int i;
   unsigned int thr_no;
   struct thr_repository* rep = &g_thr_repository;
   NdbThread *threads[MAX_THREADS];
@@ -2714,7 +2711,7 @@ ThreadConfig::doStart(NodeState::StartLe
   StartOrd * const  startOrd = (StartOrd *)&signalT.theData[0];
   startOrd->restartInfo = 0;
   
-  senddelay(block2ThreadId(CMVMI, 0), &signalT.header, 1);
+  sendprioa(block2ThreadId(CMVMI, 0), &signalT.header, signalT.theData, 0);
   return 0;
 }