From: Date: June 2 2005 11:12pm
Subject: bk commit into 5.1 tree (tomas:1.1857) BUG#11050
List-Archive: http://lists.mysql.com/internals/25533
X-Bug: 11050
Message-Id: <20050602211212.52EF07FDD6@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1857 05/06/02 23:11:54 tomas@stripped +1 -0
  CommandInterpreter.cpp:
    Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails

  storage/ndb/src/mgmclient/CommandInterpreter.cpp
    1.51 05/06/02 23:11:21 tomas@stripped +2 -1
    Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.50/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2005-04-08 02:44:09 +02:00
+++ 1.51/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2005-06-02 23:11:21 +02:00
@@ -1190,7 +1190,8 @@
 	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;