bzr push into mysql-5.1-telco-7.1 branch (jonas:3614 to 3615)

[Jonas Oreland]

 3615 Jonas Oreland	2010-05-23 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/kernel/NodeState.hpp
 3614 Jorgen Austvik	2010-05-21
      Experiment to find root cause of windows PB2 crashes

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'storage/ndb/include/kernel/NodeState.hpp'
--- a/storage/ndb/include/kernel/NodeState.hpp	2010-03-21 12:04:34 +0000
+++ b/storage/ndb/include/kernel/NodeState.hpp	2010-05-19 15:17:46 +0000
@@ -337,6 +337,12 @@ NodeState::operator=(const NodeStatePOD&
   startLevel = ns.startLevel;
   nodeGroup  = ns.nodeGroup;
   dynamicId  = ns.dynamicId;
+  // masterNodeId is union with dynamicId
+  starting.startPhase = ns.starting.startPhase;
+  starting.restartType = ns.starting.restartType;
+  // stopping.systemShutdown is union with starting.startPhase
+  // stopping.timeout is union with starting.restartType
+  stopping.alarmTime = ns.stopping.alarmTime;
   singleUserMode = ns.singleUserMode;
   singleUserApi  = ns.singleUserApi;
   m_connected_nodes.assign(ns.m_connected_nodes);


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