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

[jack andrews]

#At file:///C:/w/repo/mysql-5.1-telco-7.0-bug44248/ based on revid:jack@stripped

 2936 jack andrews	2009-06-03
      Bug #44248	Identifying nodes waited for from cluster log requires mental gymnastics.
      this commit adds _non_static_ methods to Bitmask for printing:
           * getText: 000000000000000000000000000000000000000000000000000000000015d753
           * getPrettyText:      0, 1, 4, 6, 8, 9, 10, 12, 14, 15, 16, 18 and 20
           * getPrettyTextShort: 0,1,4,6,8,9,10,12,14,15,16,18,20
      all methods take no parameters and return a BaseString

    modified:
      storage/ndb/src/common/util/Bitmask.cpp
=== modified file 'storage/ndb/src/common/util/Bitmask.cpp'
--- a/storage/ndb/src/common/util/Bitmask.cpp	2009-06-02 14:00:06 +0000
+++ b/storage/ndb/src/common/util/Bitmask.cpp	2009-06-03 13:22:59 +0000
@@ -185,15 +185,12 @@ BaseString BitmaskPOD<size>::getText()
   return BitmaskImpl::getText(size, rep.data, buf);
 }
 
-#define VARS \
-  const char* delimiter = "";         \
-  unsigned i, found = 0, MAX_BITS = 8 * size; \
-  BaseString to
-
 template <unsigned size>
 BaseString BitmaskPOD<size>::getPrettyText()
 {
-  VARS;
+  const char* delimiter = "";
+  unsigned i, found = 0, MAX_BITS = 8 * size;
+  BaseString to;
   for (i = 0; i < MAX_BITS; i++)
   {
     if (get(i))
@@ -212,7 +209,9 @@ BaseString BitmaskPOD<size>::getPrettyTe
 template <unsigned size>
 BaseString BitmaskPOD<size>::getPrettyTextShort()
 {
-  VARS;
+  const char* delimiter = "";
+  unsigned i, found = 0, MAX_BITS = 8 * size;
+  BaseString to;
   for (i = 0; i < MAX_BITS; i++)
   {
     if (get(i))


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