Commit 9905a520 authored by joreland@mysql.com's avatar joreland@mysql.com

Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 1029db2b bed5d6e4
...@@ -63,7 +63,7 @@ int main(int argc, char** argv){ ...@@ -63,7 +63,7 @@ int main(int argc, char** argv){
{ {
return NDBT_ProgramExit(NDBT_FAILED); 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; ndbout << "Cluster nodes not ready in 30 seconds." << endl;
return NDBT_ProgramExit(NDBT_FAILED); return NDBT_ProgramExit(NDBT_FAILED);
......
...@@ -64,7 +64,7 @@ int main(int argc, char** argv){ ...@@ -64,7 +64,7 @@ int main(int argc, char** argv){
ndbout << "Unable to connect to management server." << endl; ndbout << "Unable to connect to management server." << endl;
return NDBT_ProgramExit(NDBT_FAILED); 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; ndbout << "Cluster nodes not ready in 30 seconds." << endl;
return NDBT_ProgramExit(NDBT_FAILED); return NDBT_ProgramExit(NDBT_FAILED);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment