database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-22 19:52:58 +03:00
Code Activity

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

Browse Source 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
This commit is contained in:
unknown
2007-02-15 17:20:05 +08:00
parent c72d0972dc 157ee7e603
commit d10a21e844
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View File

@@ -2056,6 +2056,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) ,
@@ -2065,7 +2066,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;