bk commit into 5.0 tree (gni:1.2387)

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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@stripped, 2007-02-15 17:08:38+08:00, gni@stripped +1 -0
  Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715
  into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715
  MERGE: 1.1616.2877.51

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-02-15 17:08:36+08:00,
gni@stripped +0 -12
    Adding 'version' variable assigns the right value to prevent from the version(0.0.0.0)
status
    MERGE: 1.44.4.1

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.0/bug21715/RESYNC

--- 1.73/ndb/src/mgmclient/CommandInterpreter.cpp	2007-02-15 17:08:43 +08:00
+++ 1.74/ndb/src/mgmclient/CommandInterpreter.cpp	2007-02-15 17:08:43 +08:00
@@ -2122,6 +2122,7 @@
   }
   if (cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB){
     if (cl->node_states[i].version != 0){
+      version = cl->node_states[i].version;
       ndbout << "Node "<< cl->node_states[i].node_id <<": connected"
;
       ndbout_c(" (Version %d.%d.%d)",
              getMajor(version) ,
@@ -2131,7 +2132,7 @@
     }else
      ndbout << "Node "<< cl->node_states[i].node_id <<": not
connected" << endl;
     return 0;
-  } 
+  }
   status = cl->node_states[i].node_status;
   startPhase = cl->node_states[i].start_phase;
   version = cl->node_states[i].version;