bzr commit into mysql-5.1-telco-7.0 branch (jonas:4213)

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:martin.zaun@stripped

 4213 jonas oreland	2011-02-21
      ndb - fix a race in testMgmd -n Bug56844, refuse CONFIG_CHECK if config-change is pending

    modified:
      storage/ndb/src/mgmsrv/ConfigManager.cpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-01-31 17:37:07 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-02-21 18:53:35 +0000
@@ -1326,6 +1326,18 @@ ConfigManager::execCONFIG_CHECK_REQ(Sign
     other_checksum = checksum;
   }
 
+  if (m_prepared_config)
+  {
+    g_eventLogger->debug("Got CONFIG_CHECK_REQ from node: %d while "
+                         "config change in progress (m_prepared_config). "
+                         "Returning incorrect state, causing it to be retried",
+                         nodeId);
+    sendConfigCheckRef(ss, from, ConfigCheckRef::WrongState,
+                       generation, other_generation,
+                       m_config_state, CS_UNINITIALIZED);
+    return;
+  }
+
   g_eventLogger->debug("Got CONFIG_CHECK_REQ from node: %d. "
                        "Our generation: %d, other generation: %d, "
                        "our state: %d, other state: %d, "


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