bk commit into 4.1 tree (stewart:1.2499) BUG#15530

[Stewart Smith]

Below is the list of changes that have just been committed into a local
4.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2499 06/04/07 00:58:08 stewart@stripped +1 -0
  BUG#15530: Cluster start up "show" shows all data nodes as master during start
  
  along with the fix for 18843, this should fix the bug.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.52 06/04/07 00:57:39 stewart@stripped +1 -1
    Only show we have a master if one has been elected

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/4.1/bug15530

--- 1.51/ndb/src/mgmclient/CommandInterpreter.cpp	2005-09-13 00:08:12 +10:00
+++ 1.52/ndb/src/mgmclient/CommandInterpreter.cpp	2006-04-07 00:57:39 +10:00
@@ -1085,7 +1085,7 @@
 	  }
 	  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";
 	  }
 	}