Commit 8577fdc6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530 

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
parents c83dce6e 2123006d

storage/ndb/src/mgmclient/CommandInterpreter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ print_nodes(ndb_mgm_cluster_state *state, ndb_mgm_configuration_iterator *it, 
	  }

	  if (node_state->node_group >= 0) {

	    ndbout << ", Nodegroup: " << node_state->node_group;

	    if (node_state->dynamic_id == master_id)

	    if (master_id && node_state->dynamic_id == master_id)

	      ndbout << ", Master";

	  }

	}