Commit 336d32b1 authored by unknown's avatar unknown

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

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

parents dd3225b2 28a467c6
...@@ -1176,7 +1176,8 @@ CommandInterpreter::executeShow(char* parameters) ...@@ -1176,7 +1176,8 @@ CommandInterpreter::executeShow(char* parameters)
api_nodes++; api_nodes++;
break; break;
case NDB_MGM_NODE_TYPE_NDB: 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; master_id= state->node_states[i].dynamic_id;
ndb_nodes++; ndb_nodes++;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment