Commit ae2e80d6 authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

parents bdbace66 b442d912
Loading
Loading
Loading
Loading
+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;