Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
This commit is contained in:
commit
47430268e5
@ -1629,6 +1629,7 @@ CommandInterpreter::executeStatus(int processId,
|
|||||||
}
|
}
|
||||||
if (cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB){
|
if (cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB){
|
||||||
if (cl->node_states[i].version != 0){
|
if (cl->node_states[i].version != 0){
|
||||||
|
version = cl->node_states[i].version;
|
||||||
ndbout << "Node "<< cl->node_states[i].node_id <<": connected" ;
|
ndbout << "Node "<< cl->node_states[i].node_id <<": connected" ;
|
||||||
ndbout_c(" (Version %d.%d.%d)",
|
ndbout_c(" (Version %d.%d.%d)",
|
||||||
getMajor(version) ,
|
getMajor(version) ,
|
||||||
@ -1638,7 +1639,7 @@ CommandInterpreter::executeStatus(int processId,
|
|||||||
}else
|
}else
|
||||||
ndbout << "Node "<< cl->node_states[i].node_id <<": not connected" << endl;
|
ndbout << "Node "<< cl->node_states[i].node_id <<": not connected" << endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
status = cl->node_states[i].node_status;
|
status = cl->node_states[i].node_status;
|
||||||
startPhase = cl->node_states[i].start_phase;
|
startPhase = cl->node_states[i].start_phase;
|
||||||
version = cl->node_states[i].version;
|
version = cl->node_states[i].version;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user