summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authortulin@dl145b.mysql.com <>2005-06-02 21:25:37 +0200
committertulin@dl145b.mysql.com <>2005-06-02 21:25:37 +0200
commit342f6d54a3466744587bea479fd6cb45582407f3 (patch)
tree4d4f9527138c6f2bbef49e0325fe75d88583ba4a /ndb
parent7b9d4eaa92d50985af37a49f96a827256a54f129 (diff)
parent72288df8fcbec3cbf336ea5ddcc098fc37698985 (diff)
downloadmariadb-git-342f6d54a3466744587bea479fd6cb45582407f3.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/mgmclient/CommandInterpreter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp
index c3b0ee7fe97..34fe57d1fca 100644
--- 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;