From: Martin Zaun
Date: January 5 2011 11:55pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4041)
List-Archive: http://lists.mysql.com/commits/128027
Message-Id: <201101052356.p05HPZnY021253@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0770307702=="

--===============0770307702==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mz/mysql/ndb-7.1/ based on revid:jonas@stripped

 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
=== 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;


--===============0770307702==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: fcae94b5cb7583b556763728b3e49016d34678c5
# timestamp: 2011-01-05 15:55:52 -0800
# source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSD3obAAAzBfgFYacOP/914C
DRq////4UAWYvByhK66ptYqqowlITQm1T0xJnpJ6mnppPU9QeoaAZANqAEpAaBNTKeQ1TymjQADT
JhA0AAkUI1PRKPNTBT1PEaj2qeo9QabKNqHqaAA5hMAmAEwmE0wAACZNNAwkkEAAjEmEU/RgjSQH
qaDEeo9T9Umkrthal/modNJnWtuExLXqzQxoRPVUTYxtxkRjGJVHxIQGyTYhgdYjlbxx8exiG105
iX4jKYO53Rhc7nc5OLreQhffSk6TpHBSjo63zEeMOQjNlF3p+kGD14YgZH86WsEo033iE29n3PgG
Va0WtdogyXp1bp59R8Gkpbwuuf2PtIZgjkWi4nkEgcEFQx4nI/o8TPnu2Gxiqjy9xMkt6bnYAZ1O
ri50AD8q6B7K8ZBMwyYEMkDILOLg4oJcEESAkUiwIoejDz0SkDGWwERIoLTPkPUiBlMkDhernzKp
yQSPMwv1kUggwvZxZOJxISj08oFdW28iUYevd+EHvGae7mLmuAikbuNr+WtY2UH3xoN10FHHE3XP
6c9uFauHwIMaiIXuvikw24oJnsJVF98NdpImsKRzTGlhPuCdd4SitIo1SjhpEK0yLzlLLi/jplFA
nXSYxb0oJNkLGWslCGo9TfeJF6yLOk3bwE2Gc1QoI5HqU5NjCmCBDeJo2Qx5Z6A0SUGoI1lQmYNS
goZItCee2S0goXExrUmyskDiK/FG7DCFBJOrzVc3ISGdiNBNxQdkZl4WrDdfDSG9BWYPC+YqGZi+
zTlotFJJ/wwry65FOWrTfEpMLmaIww4MiUV9YxJdcEKCFpR2IV0a+WBcm5hY4OIrprgF2yHBN9eT
jI8yBzhw7zGYFtBlSMVDYGboDholQmFi4etDpBkMTDSKcWCgziIyCOSZiMRZiN7I7/k+BlFWAVWM
bTZvpu9NuuymuePHgOczTq8lESiJZqxwrPSAyHthT3pqH3IEqWUOhr0dGYA4JDHPXkIRMqhxfmxk
BnfuJgHET7FwBCZJyPcxAHB07CtRb5aTm12w4x+W5OaKGOtxS5hAFyIkuXh5xyOaKiExWyNwG67C
SO60XTGeyXab9EzhgD1Ei0ze9P9MCqJO4jlwNGUlRM4OUqIjy/nueTA1Qjg5HMYphp1bV6yd5Qfd
uCLMgNby+bDd1GQx0JzvhQhfClhlg3COAUfSzDwb2iI+iaxXGTztYWtpKopyKNYtXqKDJKnYIpBa
0qewfq0HVI2FQUS3/qoJFW2/hr8mrGxvRPMVV1BoL4yJWqkvfyvNjLmMxmkWD8gy4AVCO5BUYoIO
nE3uU1iW07lSWnQ+AYgfzpXwIy8GIhiwgy9hWeHz1mBAxS8UqJTQqo9ZhajUfMGyFvOwtYE6U44O
oMN20oAO0zwhkK+0+Fi7kkZurkchwBkIaTQiIVQVYP1E5Einf4I/34FNaMRGAGOgmeAMslAVCW6Q
uhGNdrcVMr3j5iOwWdBFoYtt8UG4NWJtQKVLsLQQXniAUCcIpRzeKe59LGkxZco2j3XVLAOdFmmd
u4U/LhS75xkJHrLyJEQwE5wLlOdO3gTIxyjgUhMMIJMPvZPeJmga2cRUyEjFmSNsE8PWk5mJjfcL
AVMmLWKyFsTvQVjzZBjulP4NMD977S01HgVGNhcDCCNYrUnsjAeLQ2onEEiH15+ocSgVCzS3oMwk
FwJioJJfYLQsghkuu8O8XyOJMgo2AHtURQQFSU/4u5IpwoSBB70NgA==


--===============0770307702==--