List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:January 5 2011 11:56pm
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4040 to 4041)
View as plain text  
 4041 Martin Zaun	2011-01-05 [merge]
      merge from ndb-7.1-dbg64 to ndb-7.1

    modified:
      storage/ndb/test/crund/src/crundndb/CrundDriver.cpp
 4040 jonas oreland	2011-01-05 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/util/Bitmask.hpp
      storage/ndb/src/common/util/Bitmask.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/ndbapi/NdbOperation.cpp
      storage/ndb/src/ndbapi/trp_buffer.cpp
      storage/ndb/src/ndbapi/trp_buffer.hpp
      storage/ndb/test/ndbapi/flexAsynch.cpp
=== modified file 'storage/ndb/test/crund/src/crundndb/CrundDriver.cpp'
--- a/storage/ndb/test/crund/src/crundndb/CrundDriver.cpp	2010-10-19 22:56:45 +0000
+++ b/storage/ndb/test/crund/src/crundndb/CrundDriver.cpp	2011-01-05 23:51:01 +0000
@@ -84,64 +84,64 @@ CrundDriver::initProperties() {
 
     aStart = toInt(props[L"aStart"], 256, 0);
     if (aStart < 1) {
-        msg << "[ignored] aStart:            '"
+        msg << "[ignored] aStart:               '"
             << toString(props[L"aStart"]) << "'" << endl;
         aStart = 256;
     }
     aEnd = toInt(props[L"aEnd"], aStart, 0);
     if (aEnd < aStart) {
-        msg << "[ignored] aEnd:              '"
+        msg << "[ignored] aEnd:                 '"
             << toString(props[L"aEnd"]) << "'" << endl;
         aEnd = aStart;
     }
     aScale = toInt(props[L"aScale"], 2, 0);
     if (aScale < 2) {
-        msg << "[ignored] aScale:            '"
+        msg << "[ignored] aScale:               '"
             << toString(props[L"aScale"]) << "'" << endl;
         aScale = 2;
     }
 
     bStart = toInt(props[L"bStart"], aStart, 0);
     if (bStart < 1) {
-        msg << "[ignored] bStart:            '"
+        msg << "[ignored] bStart:               '"
             << toString(props[L"bStart"]) << "'" << endl;
         bStart = aStart;
     }
     bEnd = toInt(props[L"bEnd"], bStart, 0);
     if (bEnd < bStart) {
-        msg << "[ignored] bEnd:              '"
+        msg << "[ignored] bEnd:                 '"
             << toString(props[L"bEnd"]) << "'" << endl;
         bEnd = bStart;
     }
     bScale = toInt(props[L"bScale"], 2, 0);
     if (bScale < 2) {
-        msg << "[ignored] bScale:            '"
+        msg << "[ignored] bScale:               '"
             << toString(props[L"bScale"]) << "'" << endl;
         bScale = 2;
     }
 
     maxVarbinaryBytes = toInt(props[L"maxVarbinaryBytes"], 100, 0);
     if (maxVarbinaryBytes < 1) {
-        msg << "[ignored] maxVarbinaryBytes: '"
+        msg << "[ignored] maxVarbinaryBytes:    '"
             << toString(props[L"maxVarbinaryBytes"]) << "'" << endl;
         maxVarbinaryBytes = 100;
     }
     maxVarcharChars = toInt(props[L"maxVarcharChars"], 100, 0);
     if (maxVarcharChars < 1) {
-        msg << "[ignored] maxVarcharChars:   '"
+        msg << "[ignored] maxVarcharChars:      '"
             << toString(props[L"maxVarcharChars"]) << "'" << endl;
         maxVarcharChars = 100;
     }
 
     maxBlobBytes = toInt(props[L"maxBlobBytes"], 1000, 0);
     if (maxBlobBytes < 1) {
-        msg << "[ignored] maxBlobBytes:      '"
+        msg << "[ignored] maxBlobBytes:         '"
             << toString(props[L"maxBlobBytes"]) << "'" << endl;
         maxBlobBytes = 1000;
     }
     maxTextChars = toInt(props[L"maxTextChars"], 1000, 0);
     if (maxTextChars < 1) {
-        msg << "[ignored] maxTextChars:      '"
+        msg << "[ignored] maxTextChars:         '"
             << toString(props[L"maxTextChars"]) << "'" << endl;
         maxTextChars = 1000;
     }
@@ -166,7 +166,7 @@ CrundDriver::initProperties() {
         exclude.insert(toString(s));
     }
 
-    if (msg.tellp() == 0) {
+    if (!msg.tellp()) {
         cout << "    [ok: "
              << "A=" << aStart << ".." << aEnd
              << ", B=" << bStart << ".." << bEnd << "]" << endl;


Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20110105235543-6xl95bygdxo2uwk6.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4040 to 4041) Martin Zaun6 Jan