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

--===============2134245232==
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-dbg64/ based on revid:jonas@stripped

 4041 Martin Zaun	2011-01-05
      crund - fixed minor macos gcc-4.0 compile issue.

    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;


--===============2134245232==
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-dbg64/
# testament_sha1: af6aa2bb83bfd05fc30f6d950a277c0957d95de9
# timestamp: 2011-01-05 15:51:11 -0800
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdYT904AAjlfgFYacOP/914C
DRq////4UAQ71mzgbpcmNbahJKYk2o00U8p5M0p6n6mMk2UZE0yYmmj1BoJSRgmTKaYmo9RoaAAA
AABoEkmhGpoyp+g1R7U01NpP1EZPUAxGQNAHMJgEwAmEwmmAAATJpoGEkkyp7RNMJhNFNiRpp5Q0
02U9T1DRpkaepUkr+UsS/zLw2LcTQt2rG4QTxc5GGGZni7wnoQgNUjMIYDWI4ZN9W/YwhmXhyQvJ
8o1jVtY1bXtNnabaiGWVKVUqo9dKNRpt3CNB8RP3X9Hf/fHCfjQHTOZGu20RPHP+sr3aOJI2wQwr
bm6uFw57S4G148bvc/EpzEV41YQ3CwDVWfmrPv300x2c0yXSmswgZ8Ek8HgG+ieRlWwosMmEMgZF
HW4PkKWwUB4KhXkk66pQ1yzgEiQtGHQ6mJlWgguL1rNBBNzYXbZAolExGTjlcqZtUjsY6tf5UYmO
/RhapDGqHJcshkgTwFGJfpObVdApWLVQgkefQXSEskNgTzYyYlcSl1qgm9GpM6GDhTBHMpM5BtOt
mmwR9VzxVdsAepdeOApZFw2WUZHFJF7mDykW0fYXxEXmEucUrIrEoSxlCI8lU8ZayKTblL1MEVNG
xLHpGiStFiXQK6kvIFNttiTS2jbEgTuZUKTLbfZFNIxJSSrDJSOJlixQooS0akoChtc0XBdcP4qo
dWYDomdkIrIj6tGc7BdwY4M2Qoonuqau9z3NChMM4zQkTStAiEsW+gjII7xqKC/QWM6zytyqUC/K
mZvXVds00T4Yw3WySM0yslESiJY5XBTueME+o6jDrFQtlc3Rr6dtwGM5pssgFrE5uuyvz3+RShxA
8agHxBy87gHBt5qoxZC5sWk5Urqm+MuraJYMnAnHE+FTdMYcyHHWX5qhsr5uue3fprgwHFItwd0/
qvM8ikCWzhplZVBeiawH62JpswjhAyYpHE4x3Fe+Ija13TiXG6PO0yHPC2+hB6gseX+DNrEOn+VV
G6TZm7MUGPVj4TnJMpJFozOqp7HGrSRCv9wT4bdOjCy35B7jKbXZx8R3bXiNDFhmSOTrEREYinzC
e6UG8ybIherAxKdvomf4aD0EX62IFzIL/qFOrlozPvD1hPLaqIfCKxMS8NhzWgIhFwdWsiA0xc51
nR28JjuSLa+87xnZ71AKH5STCaEB38Efv+Ku5pMA3SmcBs0YKkeEQ7x3sgpyybsEeCwRIyZbHiwt
0oUA5qx5utA7AcInXukU1UmRjGnC1mXX4wJmvRWa9x3K9TOLvvOeCuK3DhDIjXjI8PeorWyN+YKm
QSv9rJ3TNExZnVemNutIY5s+8GqLW4KMGlDpU7sknEWUk0vYxl+5c/lZVUZzXRfTWMgyhcEGWl1q
bz1oJofR5ciiosA5hcVkVFgSnZAGD49K7T2nEUdAHGcgJ6nx/4u5IpwoSGsJ+6cA


--===============2134245232==--