bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3705)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/mozGo4xU2K/7.1/ based on revid:frazer@stripped9h

 3705 Magnus Blåudd	2010-07-30 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/mgmsrv/ConfigManager.cpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp	2010-05-11 22:28:25 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp	2010-07-29 15:07:55 +0000
@@ -1735,6 +1735,11 @@ ConfigManager::run()
 
   if (!m_opts.config_cache)   
   {
+    /* Stop receiving signals by closing ConfigManager's
+       block in TransporterFacade */
+    delete m_ss;
+    m_ss = NULL;
+
     /* Confirm the present config, free the space that was allocated for a
        new one, and terminate the manager thread */
     delete m_new_config; 

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