bzr commit into mysql-5.1-telco-7.0 branch (jack:2940) Bug#44248

[jack andrews]

#At file:///C:/w/repo/mysql-5.1-telco-7.0-bug44248/ based on revid:jack@asus-20090610100235-6he4ntdn1ke2rp7p

 2940 jack andrews	2009-06-10
      Bug #44248  	Identifying nodes waited for from cluster log requires mental gymnastics.
      
      changed EventLogger to use new BaseString::getPrettyText() 
      removed nodes2str() from ConfigManager.cpp and now use getPrettyText()

    modified:
      storage/ndb/src/common/debugger/EventLogger.cpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
=== modified file 'storage/ndb/src/common/debugger/EventLogger.cpp'
--- a/storage/ndb/src/common/debugger/EventLogger.cpp	2009-06-03 15:38:04 +0000
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp	2009-06-10 10:16:30 +0000
@@ -972,7 +972,7 @@ void getTextStartReport(QQQQ) {
   for (int i = 0; i < 4; i++ )
   {
     nodebms[i].assign(sz, theData + 4 + (i * sz));
-    bstrings[i] = nodebms[i].getPrettyText();
+    bstrings[i] = BaseString::getPrettyText(nodebms[i]);
     cstrs[i] = bstrings[i].c_str();
   }
   switch(theData[1]){

=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp	2009-05-14 19:45:47 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp	2009-06-10 10:16:30 +0000
@@ -41,27 +41,6 @@ _require(bool v, const char* expr, const
 }
 #define require(v)  _require((v), #v, __FILE__, __LINE__)
 
-
-static void
-nodes2str(const NodeBitmask nodes, BaseString& to)
-{
-  unsigned found = 0;
-  const char* delimiter = "";
-  for (int i = 1; i < MAX_NODES; i++)
-  {
-    if (nodes.get(i))
-    {
-      to.appfmt("%s%d", delimiter, i);
-      found++;
-      if (found < nodes.count() - 1)
-        delimiter = ", ";
-      else
-        delimiter = " and ";
-    }
-  }
-}
-
-
 extern "C" const char* opt_connect_str;
 
 ConfigManager::ConfigManager(const MgmtSrvr::MgmtOpts& opts,
@@ -1996,7 +1975,7 @@ ConfigManager::get_packed_config(ndb_mgm
       error.assign("The cluster configuration is not yet confirmed "
                    "by all defined management servers. "
                    "This management server is still waiting for node ");
-      nodes2str(not_started, error);
+      error.append(BaseString::getPrettyText(not_started));
       error.append(" to connect.");
       return false;
     }


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