bk commit into 5.1 tree (jonas:1.2370)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2006-12-19 13:54:47+01:00, jonas@stripped +2 -0
  ndb - fix 1 prinout and 1 bug (get_version)

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2006-12-19 13:54:45+01:00, jonas@stripped +4 -0
    add mysql version to get_version

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-12-19 13:54:45+01:00, jonas@stripped +5 -5
    yet another - use common version printer function

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco

--- 1.81/storage/ndb/src/mgmapi/mgmapi.cpp	2006-12-19 13:54:52 +01:00
+++ 1.82/storage/ndb/src/mgmapi/mgmapi.cpp	2006-12-19 13:54:52 +01:00
@@ -2665,7 +2665,11 @@
     MGM_ARG("id", Int, Mandatory, "ID"),
     MGM_ARG("major", Int, Mandatory, "Major"),
     MGM_ARG("minor", Int, Mandatory, "Minor"),
+    MGM_ARG("build", Int, Optional, "Build"),
     MGM_ARG("string", String, Mandatory, "String"),
+    MGM_ARG("mysql_major", Int, Optional, "MySQL major"),
+    MGM_ARG("mysql_minor", Int, Optional, "MySQL minor"),
+    MGM_ARG("mysql_build", Int, Optional, "MySQL build"),
     MGM_END()
   };
 

--- 1.80/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2006-12-19 13:54:52 +01:00
+++ 1.81/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2006-12-19 13:54:52 +01:00
@@ -2041,7 +2041,7 @@
   }
 
   ndb_mgm_node_status status;
-  Uint32 startPhase, version;
+  Uint32 startPhase, version, mysql_version;
   bool system;
   
   struct ndb_mgm_cluster_state *cl;
@@ -2063,6 +2063,7 @@
   status = cl->node_states[i].node_status;
   startPhase = cl->node_states[i].start_phase;
   version = cl->node_states[i].version;
+  mysql_version = cl->node_states[i].mysql_version;
 
   ndbout << "Node " << processId << ": " << status_string(status);
   switch(status){
@@ -2075,11 +2076,10 @@
   default:
     break;
   }
+  
+  char tmp[100];
   if(status != NDB_MGM_NODE_STATUS_NO_CONTACT)
-    ndbout_c(" (Version %d.%d.%d)", 
-	     getMajor(version) ,
-	     getMinor(version),
-	     getBuild(version));
+    ndbout_c(" (%s)", getVersionString(version, mysql_version, 0, tmp, sizeof(tmp))); 
   else
     ndbout << endl;