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

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

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
342f6d54 · tulin@dl145b.mysql.com · 7b9d4eaa · 72288df8 · 342f6d54
Commit 342f6d54 authored Jun 02, 2005 by tulin@dl145b.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ndb/src/mgmclient/CommandInterpreter.cpp ndb/src/mgmclient/CommandInterpreter.cpp +2 -1

No files found.
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -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;