Commit 336d32b1 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into dl145b.mysql.com:/home/ndbdev/tomas/tmp

parents dd3225b2 28a467c6
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,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;