diff options
| author | unknown <mysqldev@mysql.com> | 2004-10-22 18:21:53 +0200 |
|---|---|---|
| committer | unknown <mysqldev@mysql.com> | 2004-10-22 18:21:53 +0200 |
| commit | 1cbad77b8e113f01f9353a53fbe789338fdd6f33 (patch) | |
| tree | 515a37c80bec427be4f22e315dd50e9056f59a5f /ndb/tools | |
| parent | bdf4e17f85e1e6504295aafed5aca76d977a3c1e (diff) | |
| parent | 9ccbdc6b618806a021d0ad6766c18a69517fb0a0 (diff) | |
| download | mariadb-git-1cbad77b8e113f01f9353a53fbe789338fdd6f33.tar.gz | |
Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest
ndb/tools/waiter.cpp:
Auto merged
Diffstat (limited to 'ndb/tools')
| -rw-r--r-- | ndb/tools/waiter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp index 6dcea6ccc48..c01a3f9192e 100644 --- a/ndb/tools/waiter.cpp +++ b/ndb/tools/waiter.cpp @@ -68,7 +68,7 @@ int main(int argc, const char** argv){ return NDBT_ProgramExit(NDBT_FAILED); } - for (int i = 0; i<lcfg.ids.size();i++) + for (unsigned i = 0; i<lcfg.ids.size();i++) { MgmtSrvrId * m = &lcfg.ids[i]; @@ -292,8 +292,8 @@ waitClusterStatus(const char* _addr, if (ndbNode->node_status < _status) allInState = false; else - g_info << "node_status(" << ndbNode->node_status - <<") != _status("<<_status<<")"<<endl; + g_info << "node_status(" << (unsigned)ndbNode->node_status + << ") != _status("<< (unsigned)_status << ")" <<endl; } else if (ndbNode->start_phase < _startphase) allInState = false; } else { |