bk commit into 5.1 tree (jonas:1.2497)

[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, 2007-03-20 15:30:27+01:00, jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-telco-wl3704
  MERGE: 1.2454.2.24

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-03-20 15:30:23+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.87.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-03-20 15:30:23+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.76.1.4

# 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/mysql-5.1-telco-wl3704/RESYNC

--- 1.77/storage/ndb/test/run-test/daily-basic-tests.txt	2007-03-20 15:30:32 +01:00
+++ 1.78/storage/ndb/test/run-test/daily-basic-tests.txt	2007-03-20 15:30:32 +01:00
@@ -469,6 +469,10 @@
 cmd: testScan
 args: -n ScanVariants
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug27003 T1
+
 max-time: 500
 cmd: testNodeRestart
 args: -n Bug15587 T1
@@ -791,6 +795,10 @@
 max-time: 1000
 cmd: testNodeRestart
 args: -n Bug25468 T1
+
+max-time: 1000
+cmd: test_event
+args: -l 10 -n Bug27169 T1
 
 # OLD FLEX
 max-time: 500

--- 1.88/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-03-20 15:30:32 +01:00
+++ 1.89/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-03-20 15:30:32 +01:00
@@ -2061,6 +2061,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) ,
@@ -2070,7 +2071,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;