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

[Jonas Oreland]

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

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

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-08-27 14:43:33 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-08-27 20:10:42 +0000
@@ -1573,7 +1573,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-04-25 11:01:45 +0000
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2008-08-27 20:10:42 +0000
@@ -813,6 +813,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;
     EXECUTE_DIRECT(QMGR, GSN_START_ORD, signal, 1);
     return ;

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2008-04-25 09:18:49 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2008-08-27 20:10:42 +0000
@@ -267,12 +267,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();