Commit b442d912 authored by unknown's avatar unknown
Browse files

Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
parents fec4347f 28a467c6

ndb/src/mgmclient/CommandInterpreter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ CommandInterpreter::executeShow(char* parameters) 
	api_nodes++;

	break;

      case NDB_MGM_NODE_TYPE_NDB:

	if (state->node_states[i].dynamic_id < master_id)

	if (state->node_states[i].dynamic_id &&

	    state->node_states[i].dynamic_id < master_id)

	  master_id= state->node_states[i].dynamic_id;

	ndb_nodes++;

	break;