Commit 6b3ace03 authored by gni/root@dev3-221.dev.cn.tlan's avatar gni/root@dev3-221.dev.cn.tlan

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715
parents 8d5ce410 8761abba
...@@ -2122,6 +2122,7 @@ CommandInterpreter::executeStatus(int processId, ...@@ -2122,6 +2122,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) ,
...@@ -2131,7 +2132,7 @@ CommandInterpreter::executeStatus(int processId, ...@@ -2131,7 +2132,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;
......
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