diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 20:58:26 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 20:58:26 +0100 |
| commit | dde2e462f1b64ab21e32b2500662169866a5b31d (patch) | |
| tree | 62ce6b4eeb07865ddc055b1fbe9d3e123853f772 /ndb/tools | |
| parent | 2f7fde4877b127e318b89ecf3ea9c5c9fefac86e (diff) | |
| parent | a9201bf6eb60c5ee1d1fcc42ded71105e54fdf43 (diff) | |
| download | mariadb-git-dde2e462f1b64ab21e32b2500662169866a5b31d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
Diffstat (limited to 'ndb/tools')
| -rw-r--r-- | ndb/tools/drop_index.cpp | 2 | ||||
| -rw-r--r-- | ndb/tools/drop_tab.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ndb/tools/drop_index.cpp b/ndb/tools/drop_index.cpp index 4580d44d121..e2bf7f0bfae 100644 --- a/ndb/tools/drop_index.cpp +++ b/ndb/tools/drop_index.cpp @@ -63,7 +63,7 @@ int main(int argc, char** argv){ { return NDBT_ProgramExit(NDBT_FAILED); } - if (con.wait_until_ready(30,0) < 0) + if (con.wait_until_ready(30,3) < 0) { ndbout << "Cluster nodes not ready in 30 seconds." << endl; return NDBT_ProgramExit(NDBT_FAILED); diff --git a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp index 7ce2b581ff1..991e1505486 100644 --- a/ndb/tools/drop_tab.cpp +++ b/ndb/tools/drop_tab.cpp @@ -64,7 +64,7 @@ int main(int argc, char** argv){ ndbout << "Unable to connect to management server." << endl; return NDBT_ProgramExit(NDBT_FAILED); } - if (con.wait_until_ready(30,0) < 0) + if (con.wait_until_ready(30,3) < 0) { ndbout << "Cluster nodes not ready in 30 seconds." << endl; return NDBT_ProgramExit(NDBT_FAILED); |