ndbcluster.sh:

  made compare of logs possible in ndb test
restart_log.result, restart.test, restart.result:
  new file


mysql-test/ndb/ndbcluster.sh:
  made compare of logs possible in ndb test

mysql-test/ndb/ndbcluster.sh

@@ -300,26 +300,20 @@ do_ndb_test ()
   test_result=$fs_result/${test_name}.result
   test_reject=$fs_result/${test_name}.reject
 
-  cp $clusterlog $test_log_result
-  cat ndb/${test_name}_log.result >> $test_log_result
+  clean_log='s/.*\[MgmSrvr\]//'
+
+  cat $clusterlog ndb/${test_name}_log.result | sed -e $clean_log > $test_log_result
 
   cp ndb/${test_name}.result $test_result
 
   cat ndb/${test_name}.test | $exec_mgmtclient > $test_reject
-  cp $clusterlog $test_log_reject
-  r=`diff -C 5 $test_result $test_reject`
-  if [ $r ] ; then
-    t="fail"
-  else
+  cat $clusterlog | sed -e $clean_log > $test_log_reject
+
   t="pass"
-  fi
+  diff -C 5 $test_result $test_reject || t="fail"
   printf "ndb_mgm output    %20s [%s]\n" $test_name $t
-  r=`diff -C 5 $test_log_result $test_log_reject`
-  if [ $r ] ; then
-    t="fail"
-  else
   t="pass"
-  fi
+  diff -C 5 $test_log_result $test_log_reject || t="fail"
   printf "clusterlog output %20s [%s]\n" $test_name $t
 }
 

mysql-test/ndb/restart.result

+-- NDB Cluster -- Management Client --
+Connected to Management Server at: localhost:1186
+ALL disabled
+Cluster logging is enabled.
+ALERT enabled
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Node 1 is being restarted.
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Node 1 is being restarted.
+
+ALL enabled

mysql-test/ndb/restart.test

+clusterlog off all
+clusterlog on
+clusterlog on alert
+all clusterlog connection=0
+sleep 1
+1 restart
+sleep 5
+all clusterlog connection=8
+sleep 1
+1 restart
+sleep 5
+clusterlog on all

mysql-test/ndb/restart_log.result

+ ALERT    -- Node 2: Network partitioning - arbitration required
+ ALERT    -- Node 2: Arbitration won - positive reply from node 3
+ ALERT    -- Node 2: Node 1 has failed. The Node state at failure was 0
+ ALERT    -- Node 2: Node failure of 1 DBLQH completed
+ ALERT    -- Node 2: Node failure of 1 DBDICT completed
+ ALERT    -- Node 2: Node failure of 1 DBDIH completed
+ ALERT    -- Node 2: Node failure of 1 DBTC completed
+ ALERT    -- Node 2: Node 2 completed failure of Node 1
+ ALERT    -- Node 2: All nodes completed failure of Node 1
+ ALERT    -- Node 3: Node 1 Disconnected
+ ALERT    -- Node 2: Node 1 Disconnected
+ ALERT    -- Node 2: Network partitioning - arbitration required
+ ALERT    -- Node 2: Arbitration won - positive reply from node 3
+ ALERT    -- Node 2: Node 1 has failed. The Node state at failure was 0
+ ALERT    -- Node 2: Node failure of 1 DBLQH completed
+ ALERT    -- Node 2: Node failure of 1 DBDICT completed
+ ALERT    -- Node 2: Node failure of 1 DBDIH completed
+ ALERT    -- Node 2: Node failure of 1 DBTC completed
+ ALERT    -- Node 2: Node 2 completed failure of Node 1
+ ALERT    -- Node 2: All nodes completed failure of Node 1