From b454d067cb25457c27c6ed97fd0146f046553318 Mon Sep 17 00:00:00 2001
From: Magnus Svensson <msvensson@mysql.com>
Date: Fri, 14 Nov 2008 09:45:32 +0100
Subject: [PATCH] WL#4189 Add full backward compatibility to mysql-test-run.pl 
 - Add copy of mtr v1 and make it possible to run it using MTR_VERSION=1

---
 mysql-test/Makefile.am                  |   20 +-
 mysql-test/lib/v1/My/Config.pm          |  422 ++
 mysql-test/lib/v1/mtr_cases.pl          |  968 ++++
 mysql-test/lib/v1/mtr_gcov.pl           |   74 +
 mysql-test/lib/v1/mtr_gprof.pl          |   64 +
 mysql-test/lib/v1/mtr_im.pl             |  775 ++++
 mysql-test/lib/v1/mtr_io.pl             |  218 +
 mysql-test/lib/v1/mtr_match.pl          |   98 +
 mysql-test/lib/v1/mtr_misc.pl           |  312 ++
 mysql-test/lib/v1/mtr_process.pl        | 1142 +++++
 mysql-test/lib/v1/mtr_report.pl         |  598 +++
 mysql-test/lib/v1/mtr_stress.pl         |  191 +
 mysql-test/lib/v1/mtr_timer.pl          |  158 +
 mysql-test/lib/v1/mtr_unique.pl         |  178 +
 mysql-test/lib/v1/mysql-test-run.pl     | 5393 +++++++++++++++++++++++
 mysql-test/lib/v1/ndb_config_1_node.ini |   47 +
 mysql-test/lib/v1/ndb_config_2_node.ini |   55 +
 mysql-test/mysql-test-run.pl            |   26 +
 18 files changed, 10738 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/lib/v1/My/Config.pm
 create mode 100644 mysql-test/lib/v1/mtr_cases.pl
 create mode 100644 mysql-test/lib/v1/mtr_gcov.pl
 create mode 100644 mysql-test/lib/v1/mtr_gprof.pl
 create mode 100644 mysql-test/lib/v1/mtr_im.pl
 create mode 100644 mysql-test/lib/v1/mtr_io.pl
 create mode 100644 mysql-test/lib/v1/mtr_match.pl
 create mode 100644 mysql-test/lib/v1/mtr_misc.pl
 create mode 100644 mysql-test/lib/v1/mtr_process.pl
 create mode 100644 mysql-test/lib/v1/mtr_report.pl
 create mode 100644 mysql-test/lib/v1/mtr_stress.pl
 create mode 100644 mysql-test/lib/v1/mtr_timer.pl
 create mode 100644 mysql-test/lib/v1/mtr_unique.pl
 create mode 100755 mysql-test/lib/v1/mysql-test-run.pl
 create mode 100644 mysql-test/lib/v1/ndb_config_1_node.ini
 create mode 100644 mysql-test/lib/v1/ndb_config_2_node.ini

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 616ae633eb7..0db8ba825ca 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -24,7 +24,25 @@ test_SCRIPTS =	mtr \
 		mysql-test-run.pl \
 		mysql-stress-test.pl
 
-nobase_test_DATA = lib/mtr_cases.pm \
+nobase_test_DATA = \
+	lib/v1/mysql-test-run.pl \
+	lib/v1/mtr_cases.pl \
+	lib/v1/mtr_io.pl \
+	lib/v1/mtr_report.pl \
+	lib/v1/My/Config.pm \
+	lib/v1/mtr_gcov.pl \
+	lib/v1/mtr_match.pl \
+	lib/v1/mtr_stress.pl \
+	lib/v1/ndb_config_1_node.ini \
+	lib/v1/ndb_config_2_node.ini \
+	lib/v1/mtr_gprof.pl \
+	lib/v1/mtr_misc.pl \
+	lib/v1/mtr_timer.pl \
+	lib/v1/mtr_im.pl \
+	lib/v1/mtr_process.pl \
+	lib/v1/mtr_unique.pl \
+\
+	lib/mtr_cases.pm \
 	lib/mtr_gcov.pl \
 	lib/mtr_gprof.pl \
 	lib/mtr_io.pl \
diff --git a/mysql-test/lib/v1/My/Config.pm b/mysql-test/lib/v1/My/Config.pm
new file mode 100644
index 00000000000..5491e341ddc
--- /dev/null
+++ b/mysql-test/lib/v1/My/Config.pm
@@ -0,0 +1,422 @@
+# -*- cperl -*-
+
+package My::Config::Option;
+
+use strict;
+use warnings;
+
+
+sub new {
+  my ($class, $option_name, $option_value)= @_;
+  my $self= bless { name => $option_name,
+		    value => $option_value
+		  }, $class;
+  return $self;
+}
+
+
+sub name {
+  my ($self)= @_;
+  return $self->{name};
+}
+
+
+sub value {
+  my ($self)= @_;
+  return $self->{value};
+}
+
+
+package My::Config::Group;
+
+use strict;
+use warnings;
+
+
+sub new {
+  my ($class, $group_name)= @_;
+  my $self= bless { name => $group_name,
+		    options => [],
+		    options_by_name => {},
+		  }, $class;
+  return $self;
+}
+
+
+sub insert {
+  my ($self, $option_name, $value, $if_not_exist)= @_;
+  my $option= $self->option($option_name);
+  if (defined($option) and !$if_not_exist) {
+    $option->{value}= $value;
+  }
+  else {
+    my $option= My::Config::Option->new($option_name, $value);
+    # Insert option in list
+    push(@{$self->{options}}, $option);
+    # Insert option in hash
+    $self->{options_by_name}->{$option_name}= $option;
+  }
+  return $option;
+}
+
+sub remove {
+  my ($self, $option_name)= @_;
+
+  # Check that option exists
+  my $option= $self->option($option_name);
+
+  return undef unless defined $option;
+
+  # Remove from the hash
+  delete($self->{options_by_name}->{$option_name}) or die;
+
+  # Remove from the array
+  @{$self->{options}}= grep { $_->name ne $option_name } @{$self->{options}};
+
+  return $option;
+}
+
+
+sub options {
+  my ($self)= @_;
+  return @{$self->{options}};
+}
+
+
+sub name {
+  my ($self)= @_;
+  return $self->{name};
+}
+
+
+#
+# Return a specific option in the group
+#
+sub option {
+  my ($self, $option_name)= @_;
+
+  return $self->{options_by_name}->{$option_name};
+}
+
+
+#
+# Return a specific value for an option in the group
+#
+sub value {
+  my ($self, $option_name)= @_;
+  my $option= $self->option($option_name);
+
+  die "No option named '$option_name' in this group"
+    if ! defined($option);
+
+  return $option->value();
+}
+
+
+package My::Config;
+
+use strict;
+use warnings;
+use IO::File;
+use File::Basename;
+
+#
+# Constructor for My::Config
+# - represents a my.cnf config file
+#
+# Array of arrays
+#
+sub new {
+  my ($class, $path)= @_;
+  my $group_name= undef;
+
+  my $self= bless { groups => [] }, $class;
+  my $F= IO::File->new($path, "<")
+    or die "Could not open '$path': $!";
+
+  while (  my $line= <$F> ) {
+    chomp($line);
+
+    # [group]
+    if ( $line =~ /\[(.*)\]/ ) {
+      # New group found
+      $group_name= $1;
+      #print "group: $group_name\n";
+
+      $self->insert($group_name, undef, undef);
+    }
+
+    # Magic #! comments
+    elsif ( $line =~ /^#\!/) {
+      my $magic= $line;
+      die "Found magic comment '$magic' outside of group"
+	unless $group_name;
+
+      #print "$magic\n";
+      $self->insert($group_name, $magic, undef);
+    }
+
+    # Comments
+    elsif ( $line =~ /^#/ || $line =~ /^;/) {
+      # Skip comment
+      next;
+    }
+
+    # Empty lines
+    elsif ( $line =~ /^$/ ) {
+      # Skip empty lines
+      next;
+    }
+
+    # !include <filename>
+    elsif ( $line =~ /^\!include\s*(.*?)\s*$/ ) {
+      my $include_file_name= dirname($path)."/".$1;
+      # Check that the file exists
+      die "The include file '$include_file_name' does not exist"
+	unless -f $include_file_name;
+
+      $self->append(My::Config->new($include_file_name));
+    }
+
+    # <option>
+    elsif ( $line =~ /^([\@\w-]+)\s*$/ ) {
+      my $option= $1;
+
+      die "Found option '$option' outside of group"
+	unless $group_name;
+
+      #print "$option\n";
+      $self->insert($group_name, $option, undef);
+    }
+
+    # <option>=<value>
+    elsif ( $line =~ /^([\@\w-]+)\s*=\s*(.*?)\s*$/ ) {
+      my $option= $1;
+      my $value= $2;
+
+      die "Found option '$option=$value' outside of group"
+	unless $group_name;
+
+      #print "$option=$value\n";
+      $self->insert($group_name, $option, $value);
+    } else {
+      die "Unexpected line '$line' found in '$path'";
+    }
+
+  }
+  undef $F;			# Close the file
+
+  return $self;
+}
+
+#
+# Insert a new group if it does not already exist
+# and add option if defined
+#
+sub insert {
+  my ($self, $group_name, $option, $value, $if_not_exist)= @_;
+  my $group;
+
+  # Create empty array for the group if it doesn't exist
+  if ( !$self->group_exists($group_name) ) {
+    $group= $self->_group_insert($group_name);
+  }
+  else {
+    $group= $self->group($group_name);
+  }
+
+  if ( defined $option ) {
+    #print "option: $option, value: $value\n";
+
+    # Add the option to the group
+    $group->insert($option, $value, $if_not_exist);
+  }
+}
+
+#
+# Remove a option, given group and option name
+#
+sub remove {
+  my ($self, $group_name, $option_name)= @_;
+  my $group= $self->group($group_name);
+
+  die "group '$group_name' does not exist"
+    unless defined($group);
+
+  $group->remove($option_name) or
+    die "option '$option_name' does not exist";
+}
+
+
+
+#
+# Check if group with given name exists in config
+#
+sub group_exists {
+  my ($self, $group_name)= @_;
+
+  foreach my $group ($self->groups()) {
+    return 1 if $group->{name} eq $group_name;
+  }
+  return 0;
+}
+
+
+#
+# Insert a new group into config
+#
+sub _group_insert {
+  my ($self, $group_name)= @_;
+  caller eq __PACKAGE__ or die;
+
+  # Check that group does not already exist
+  die "Group already exists" if $self->group_exists($group_name);
+
+  my $group= My::Config::Group->new($group_name);
+  push(@{$self->{groups}}, $group);
+  return $group;
+}
+
+
+#
+# Append a configuration to current config
+#
+sub append {
+  my ($self, $from)= @_;
+
+  foreach my $group ($from->groups()) {
+    foreach my $option ($group->options()) {
+      $self->insert($group->name(), $option->name(), $option->value());
+    }
+
+  }
+}
+
+
+#
+# Return a list with all the groups in config
+#
+sub groups {
+  my ($self)= @_;
+  return ( @{$self->{groups}} );
+}
+
+
+#
+# Return a list of all the groups in config
+# starting with the given string
+#
+sub like {
+  my ($self, $prefix)= @_;
+  return ( grep ( $_->{name} =~ /^$prefix/, $self->groups()) );
+}
+
+
+#
+# Return the first group in config
+# starting with the given string
+#
+sub first_like {
+  my ($self, $prefix)= @_;
+  return ($self->like($prefix))[0];
+}
+
+
+#
+# Return a specific group in the config
+#
+sub group {
+  my ($self, $group_name)= @_;
+
+  foreach my $group ( $self->groups() ) {
+    return $group if $group->{name} eq $group_name;
+  }
+  return undef;
+}
+
+
+#
+# Return a list of all options in a specific group in the config
+#
+sub options_in_group {
+  my ($self, $group_name)= @_;
+
+  my $group= $self->group($group_name);
+  return () unless defined $group;
+  return $group->options();
+}
+
+
+#
+# Return a value given group and option name
+#
+sub value {
+  my ($self, $group_name, $option_name)= @_;
+  my $group= $self->group($group_name);
+
+  die "group '$group_name' does not exist"
+    unless defined($group);
+
+  my $option= $group->option($option_name);
+  die "option '$option_name' does not exist"
+    unless defined($option);
+
+  return $option->value();
+}
+
+
+#
+# Check if an option exists
+#
+sub exists {
+  my ($self, $group_name, $option_name)= @_;
+  my $group= $self->group($group_name);
+
+  die "group '$group_name' does not exist"
+    unless defined($group);
+
+  my $option= $group->option($option_name);
+  return defined($option);
+}
+
+
+# Overload "to string"-operator with 'stringify'
+use overload
+    '""' => \&stringify;
+
+#
+# Return the config as a string in my.cnf file format
+#
+sub stringify {
+  my ($self)= @_;
+  my $res;
+
+  foreach my $group ($self->groups()) {
+    $res .= "[$group->{name}]\n";
+
+    foreach my $option ($group->options()) {
+      $res .= $option->name();
+      my $value= $option->value();
+      if (defined $value) {
+	$res .= "=$value";
+      }
+      $res .= "\n";
+    }
+    $res .= "\n";
+  }
+  return $res;
+}
+
+
+#
+# Save the config to named file
+#
+sub save {
+    my ($self, $path)= @_;
+    my $F= IO::File->new($path, ">")
+	or die "Could not open '$path': $!";
+    print $F $self;
+    undef $F; # Close the file
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_cases.pl b/mysql-test/lib/v1/mtr_cases.pl
new file mode 100644
index 00000000000..3b47a89d3d2
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_cases.pl
@@ -0,0 +1,968 @@
+# -*- cperl -*-
+# Copyright (C) 2005-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use File::Basename;
+use IO::File();
+use strict;
+
+use My::Config;
+
+sub collect_test_cases ($);
+sub collect_one_suite ($);
+sub collect_one_test_case ($$$$$$$$$);
+
+sub mtr_options_from_test_file($$);
+
+my $do_test;
+my $skip_test;
+
+sub init_pattern {
+  my ($from, $what)= @_;
+  if ( $from =~ /^[a-z0-9]$/ ) {
+    # Does not contain any regex, make the pattern match
+    # beginning of string
+    $from= "^$from";
+  }
+  # Check that pattern is a valid regex
+  eval { "" =~/$from/; 1 } or
+    mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
+  return $from;
+}
+
+
+
+##############################################################################
+#
+#  Collect information about test cases we are to run
+#
+##############################################################################
+
+sub collect_test_cases ($) {
+  $do_test= init_pattern($::opt_do_test, "--do-test");
+  $skip_test= init_pattern($::opt_skip_test, "--skip-test");
+
+  my $suites= shift; # Semicolon separated list of test suites
+  my $cases = [];    # Array of hash
+
+  foreach my $suite (split(",", $suites))
+  {
+    push(@$cases, collect_one_suite($suite));
+  }
+
+
+  if ( @::opt_cases )
+  {
+    # Check that the tests specified was found
+    # in at least one suite
+    foreach my $test_name_spec ( @::opt_cases )
+    {
+      my $found= 0;
+      my ($sname, $tname, $extension)= split_testname($test_name_spec);
+      foreach my $test ( @$cases )
+      {
+	# test->{name} is always in suite.name format
+	if ( $test->{name} =~ /.*\.$tname/ )
+	{
+	  $found= 1;
+	}
+      }
+      if ( not $found )
+      {
+	mtr_error("Could not find $tname in any suite");
+      }
+    }
+  }
+
+  if ( $::opt_reorder )
+  {
+    # Reorder the test cases in an order that will make them faster to run
+    my %sort_criteria;
+
+    # Make a mapping of test name to a string that represents how that test
+    # should be sorted among the other tests.  Put the most important criterion
+    # first, then a sub-criterion, then sub-sub-criterion, et c.
+    foreach my $tinfo (@$cases)
+    {
+      my @criteria = ();
+
+      # Look for tests that muct be in run in a defined order
+      # that is defined by test having the same name except for
+      # the ending digit
+
+      # Put variables into hash
+      my $test_name= $tinfo->{'name'};
+      my $depend_on_test_name;
+      if ( $test_name =~ /^([\D]+)([0-9]{1})$/ )
+      {
+	my $base_name= $1;
+	my $idx= $2;
+	mtr_verbose("$test_name =>  $base_name idx=$idx");
+	if ( $idx > 1 )
+	{
+	  $idx-= 1;
+	  $base_name= "$base_name$idx";
+	  mtr_verbose("New basename $base_name");
+	}
+
+	foreach my $tinfo2 (@$cases)
+	{
+	  if ( $tinfo2->{'name'} eq $base_name )
+	  {
+	    mtr_verbose("found dependent test $tinfo2->{'name'}");
+	    $depend_on_test_name=$base_name;
+	  }
+	}
+      }
+
+      if ( defined $depend_on_test_name )
+      {
+	mtr_verbose("Giving $test_name same critera as $depend_on_test_name");
+	$sort_criteria{$test_name} = $sort_criteria{$depend_on_test_name};
+      }
+      else
+      {
+	#
+	# Append the criteria for sorting, in order of importance.
+	#
+	push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));
+	# Group test with equal options together.
+	# Ending with "~" makes empty sort later than filled
+	push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");
+
+	$sort_criteria{$test_name} = join(" ", @criteria);
+      }
+    }
+
+    @$cases = sort {
+      $sort_criteria{$a->{'name'}} . $a->{'name'} cmp
+	$sort_criteria{$b->{'name'}} . $b->{'name'}; } @$cases;
+
+    if ( $::opt_script_debug )
+    {
+      # For debugging the sort-order
+      foreach my $tinfo (@$cases)
+      {
+	print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n");
+      }
+    }
+  }
+
+  return $cases;
+
+}
+
+# Valid extensions and their corresonding component id
+my %exts = ( 'test' => 'mysqld',
+	     'imtest' => 'im'
+	   );
+
+
+# Returns (suitename, testname, extension)
+sub split_testname {
+  my ($test_name)= @_;
+
+  # Get rid of directory part and split name on .'s
+  my @parts= split(/\./, basename($test_name));
+
+  if (@parts == 1){
+    # Only testname given, ex: alias
+    return (undef , $parts[0], undef);
+  } elsif (@parts == 2) {
+    # Either testname.test or suite.testname given
+    # Ex. main.alias or alias.test
+
+    if (defined $exts{$parts[1]})
+    {
+      return (undef , $parts[0], $parts[1]);
+    }
+    else
+    {
+      return ($parts[0], $parts[1], undef);
+    }
+
+  } elsif (@parts == 3) {
+    # Fully specified suitename.testname.test
+    # ex main.alias.test
+    return ( $parts[0], $parts[1], $parts[2]);
+  }
+
+  mtr_error("Illegal format of test name: $test_name");
+}
+
+
+sub collect_one_suite($)
+{
+  my $suite= shift;  # Test suite name
+  my @cases;  # Array of hash
+
+  mtr_verbose("Collecting: $suite");
+
+  my $suitedir= "$::glob_mysql_test_dir"; # Default
+  if ( $suite ne "main" )
+  {
+    $suitedir= mtr_path_exists("$suitedir/suite/$suite",
+			       "$suitedir/$suite");
+    mtr_verbose("suitedir: $suitedir");
+  }
+
+  my $testdir= "$suitedir/t";
+  my $resdir=  "$suitedir/r";
+
+  # ----------------------------------------------------------------------
+  # Build a hash of disabled testcases for this suite
+  # ----------------------------------------------------------------------
+  my %disabled;
+  if ( open(DISABLED, "$testdir/disabled.def" ) )
+  {
+    while ( <DISABLED> )
+      {
+        chomp;
+        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
+          {
+            $disabled{$1}= $2;
+          }
+      }
+    close DISABLED;
+  }
+
+  # Read suite.opt file
+  my $suite_opt_file=  "$testdir/suite.opt";
+  my $suite_opts= [];
+  if ( -f $suite_opt_file )
+  {
+    $suite_opts= mtr_get_opts_from_file($suite_opt_file);
+  }
+
+  if ( @::opt_cases )
+  {
+    # Collect in specified order
+    foreach my $test_name_spec ( @::opt_cases )
+    {
+      my ($sname, $tname, $extension)= split_testname($test_name_spec);
+
+      # The test name parts have now been defined
+      #print "  suite_name: $sname\n";
+      #print "  tname:      $tname\n";
+      #print "  extension:  $extension\n";
+
+      # Check cirrect suite if suitename is defined
+      next if (defined $sname and $suite ne $sname);
+
+      my $component_id;
+      if ( defined $extension )
+      {
+	my $full_name= "$testdir/$tname.$extension";
+	# Extension was specified, check if the test exists
+        if ( ! -f $full_name)
+        {
+	  # This is only an error if suite was specified, otherwise it
+	  # could exist in another suite
+          mtr_error("Test '$full_name' was not found in suite '$sname'")
+	    if $sname;
+
+	  next;
+        }
+	$component_id= $exts{$extension};
+      }
+      else
+      {
+	# No extension was specified
+	my ($ext, $component);
+	while (($ext, $component)= each %exts) {
+	  my $full_name= "$testdir/$tname.$ext";
+
+	  if ( ! -f $full_name ) {
+	    next;
+	  }
+	  $component_id= $component;
+	  $extension= $ext;
+	}
+	# Test not found here, could exist in other suite
+	next unless $component_id;
+      }
+
+      collect_one_test_case($testdir,$resdir,$suite,$tname,
+                            "$tname.$extension",\@cases,\%disabled,
+			    $component_id,$suite_opts);
+    }
+  }
+  else
+  {
+    opendir(TESTDIR, $testdir) or mtr_error("Can't open dir \"$testdir\": $!");
+
+    foreach my $elem ( sort readdir(TESTDIR) )
+    {
+      my $component_id= undef;
+      my $tname= undef;
+
+      if ($tname= mtr_match_extension($elem, 'test'))
+      {
+        $component_id = 'mysqld';
+      }
+      elsif ($tname= mtr_match_extension($elem, 'imtest'))
+      {
+        $component_id = 'im';
+      }
+      else
+      {
+        next;
+      }
+
+      # Skip tests that does not match the --do-test= filter
+      next if ($do_test and not $tname =~ /$do_test/o);
+
+      collect_one_test_case($testdir,$resdir,$suite,$tname,
+                            $elem,\@cases,\%disabled,$component_id,
+			    $suite_opts);
+    }
+    closedir TESTDIR;
+  }
+
+
+  #  Return empty list if no testcases found
+  return if (@cases == 0);
+
+  # ----------------------------------------------------------------------
+  # Read combinations for this suite and build testcases x combinations
+  # if any combinations exists
+  # ----------------------------------------------------------------------
+  if ( ! $::opt_skip_combination )
+  {
+    my @combinations;
+    my $combination_file= "$suitedir/combinations";
+    #print "combination_file: $combination_file\n";
+    if (@::opt_combinations)
+    {
+      # take the combination from command-line
+      mtr_verbose("Take the combination from command line");
+      foreach my $combination (@::opt_combinations) {
+	my $comb= {};
+	$comb->{name}= $combination;
+	push(@{$comb->{comb_opt}}, $combination);
+	push(@combinations, $comb);
+      }
+    }
+    elsif (-f $combination_file )
+    {
+      # Read combinations file in my.cnf format
+      mtr_verbose("Read combinations file");
+      my $config= My::Config->new($combination_file);
+
+      foreach my $group ($config->groups()) {
+	my $comb= {};
+	$comb->{name}= $group->name();
+        foreach my $option ( $group->options() ) {
+	  push(@{$comb->{comb_opt}}, $option->name()."=".$option->value());
+	}
+	push(@combinations, $comb);
+      }
+    }
+
+    if (@combinations)
+    {
+      print " - adding combinations\n";
+      #print_testcases(@cases);
+
+      my @new_cases;
+      foreach my $comb (@combinations)
+      {
+	foreach my $test (@cases)
+	{
+	  #print $test->{name}, " ", $comb, "\n";
+	  my $new_test= {};
+
+	  while (my ($key, $value) = each(%$test)) {
+	    if (ref $value eq "ARRAY") {
+	      push(@{$new_test->{$key}}, @$value);
+	    } else {
+	      $new_test->{$key}= $value;
+	    }
+	  }
+
+	  # Append the combination options to master_opt and slave_opt
+	  push(@{$new_test->{master_opt}}, @{$comb->{comb_opt}});
+	  push(@{$new_test->{slave_opt}}, @{$comb->{comb_opt}});
+
+	  # Add combination name shrt name
+	  $new_test->{combination}= $comb->{name};
+
+	  # Add the new test to new test cases list
+	  push(@new_cases, $new_test);
+	}
+      }
+      #print_testcases(@new_cases);
+      @cases= @new_cases;
+      #print_testcases(@cases);
+    }
+  }
+
+  optimize_cases(\@cases);
+  #print_testcases(@cases);
+
+  return @cases;
+}
+
+
+#
+# Loop through all test cases
+# - optimize which test to run by skipping unnecessary ones
+# - update settings if necessary
+#
+sub optimize_cases {
+  my ($cases)= @_;
+
+  foreach my $tinfo ( @$cases )
+  {
+    # Skip processing if already marked as skipped
+    next if $tinfo->{skip};
+
+    # =======================================================
+    # If a special binlog format was selected with
+    # --mysqld=--binlog-format=x, skip all test that does not
+    # support it
+    # =======================================================
+    #print "used_binlog_format: $::used_binlog_format\n";
+    if (defined $::used_binlog_format )
+    {
+      # =======================================================
+      # Fixed --binlog-format=x specified on command line
+      # =======================================================
+      if ( defined $tinfo->{'binlog_formats'} )
+      {
+	#print "binlog_formats: ". join(", ", @{$tinfo->{binlog_formats}})."\n";
+
+	# The test supports different binlog formats
+	# check if the selected one is ok
+	my $supported=
+	  grep { $_ eq $::used_binlog_format } @{$tinfo->{'binlog_formats'}};
+	if ( !$supported )
+	{
+	  $tinfo->{'skip'}= 1;
+	  $tinfo->{'comment'}=
+	    "Doesn't support --binlog-format='$::used_binlog_format'";
+	}
+      }
+    }
+    else
+    {
+      # =======================================================
+      # Use dynamic switching of binlog format
+      # =======================================================
+
+      # Get binlog-format used by this test from master_opt
+      my $test_binlog_format;
+      foreach my $opt ( @{$tinfo->{master_opt}} ) {
+	$test_binlog_format=
+	  mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format;
+      }
+
+      if (defined $test_binlog_format and
+	  defined $tinfo->{binlog_formats} )
+      {
+	my $supported=
+	  grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}};
+	if ( !$supported )
+	{
+	  $tinfo->{'skip'}= 1;
+	  $tinfo->{'comment'}=
+	    "Doesn't support --binlog-format='$test_binlog_format'";
+	  next;
+	}
+      }
+    }
+
+  }
+}
+
+
+##############################################################################
+#
+#  Collect information about a single test case
+#
+##############################################################################
+
+
+sub collect_one_test_case($$$$$$$$$) {
+  my $testdir= shift;
+  my $resdir=  shift;
+  my $suite=   shift;
+  my $tname=   shift;
+  my $elem=    shift;
+  my $cases=   shift;
+  my $disabled=shift;
+  my $component_id= shift;
+  my $suite_opts= shift;
+
+  my $path= "$testdir/$elem";
+
+  # ----------------------------------------------------------------------
+  # Skip some tests silently
+  # ----------------------------------------------------------------------
+
+  if ( $::opt_start_from and $tname lt $::opt_start_from )
+  {
+    return;
+  }
+
+
+  my $tinfo= {};
+  $tinfo->{'name'}= basename($suite) . ".$tname";
+  $tinfo->{'result_file'}= "$resdir/$tname.result";
+  $tinfo->{'component_id'} = $component_id;
+  push(@$cases, $tinfo);
+
+  # ----------------------------------------------------------------------
+  # Skip some tests but include in list, just mark them to skip
+  # ----------------------------------------------------------------------
+
+  if ( $skip_test and $tname =~ /$skip_test/o )
+  {
+    $tinfo->{'skip'}= 1;
+    return;
+  }
+
+  # ----------------------------------------------------------------------
+  # Collect information about test case
+  # ----------------------------------------------------------------------
+
+  $tinfo->{'path'}= $path;
+  $tinfo->{'timezone'}= "GMT-3"; # for UNIX_TIMESTAMP tests to work
+
+  $tinfo->{'slave_num'}= 0; # Default, no slave
+  $tinfo->{'master_num'}= 1; # Default, 1 master
+  if ( defined mtr_match_prefix($tname,"rpl") )
+  {
+    if ( $::opt_skip_rpl )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No replication tests(--skip-rpl)";
+      return;
+    }
+
+    $tinfo->{'slave_num'}= 1; # Default for rpl* tests, use one slave
+
+  }
+
+  if ( defined mtr_match_prefix($tname,"federated") )
+  {
+    # Default, federated uses the first slave as it's federated database
+    $tinfo->{'slave_num'}= 1;
+  }
+
+  my $master_opt_file= "$testdir/$tname-master.opt";
+  my $slave_opt_file=  "$testdir/$tname-slave.opt";
+  my $slave_mi_file=   "$testdir/$tname.slave-mi";
+  my $master_sh=       "$testdir/$tname-master.sh";
+  my $slave_sh=        "$testdir/$tname-slave.sh";
+  my $disabled_file=   "$testdir/$tname.disabled";
+  my $im_opt_file=     "$testdir/$tname-im.opt";
+
+  $tinfo->{'master_opt'}= [];
+  $tinfo->{'slave_opt'}=  [];
+  $tinfo->{'slave_mi'}=   [];
+
+
+  # Add suite opts
+  foreach my $opt ( @$suite_opts )
+  {
+    mtr_verbose($opt);
+    push(@{$tinfo->{'master_opt'}}, $opt);
+    push(@{$tinfo->{'slave_opt'}}, $opt);
+  }
+
+  # Add master opts
+  if ( -f $master_opt_file )
+  {
+
+    my $master_opt= mtr_get_opts_from_file($master_opt_file);
+
+    foreach my $opt ( @$master_opt )
+    {
+      my $value;
+
+      # The opt file is used both to send special options to the mysqld
+      # as well as pass special test case specific options to this
+      # script
+
+      $value= mtr_match_prefix($opt, "--timezone=");
+      if ( defined $value )
+      {
+	$tinfo->{'timezone'}= $value;
+	next;
+      }
+
+      $value= mtr_match_prefix($opt, "--slave-num=");
+      if ( defined $value )
+      {
+	$tinfo->{'slave_num'}= $value;
+	next;
+      }
+
+      $value= mtr_match_prefix($opt, "--result-file=");
+      if ( defined $value )
+      {
+	# Specifies the file mysqltest should compare
+	# output against
+	$tinfo->{'result_file'}= "r/$value.result";
+	next;
+      }
+
+      # If we set default time zone, remove the one we have
+      $value= mtr_match_prefix($opt, "--default-time-zone=");
+      if ( defined $value )
+      {
+	# Set timezone for this test case to something different
+	$tinfo->{'timezone'}= "GMT-8";
+	# Fallthrough, add the --default-time-zone option
+      }
+
+      # The --restart option forces a restart even if no special
+      # option is set. If the options are the same as next testcase
+      # there is no need to restart after the testcase
+      # has completed
+      if ( $opt eq "--force-restart" )
+      {
+	$tinfo->{'force_restart'}= 1;
+	next;
+      }
+
+      # Ok, this was a real option, add it
+      push(@{$tinfo->{'master_opt'}}, $opt);
+    }
+  }
+
+  # Add slave opts
+  if ( -f $slave_opt_file )
+  {
+    my $slave_opt= mtr_get_opts_from_file($slave_opt_file);
+
+    foreach my $opt ( @$slave_opt )
+    {
+      # If we set default time zone, remove the one we have
+      my $value= mtr_match_prefix($opt, "--default-time-zone=");
+      $tinfo->{'slave_opt'}= [] if defined $value;
+    }
+    push(@{$tinfo->{'slave_opt'}}, @$slave_opt);
+  }
+
+  if ( -f $slave_mi_file )
+  {
+    $tinfo->{'slave_mi'}= mtr_get_opts_from_file($slave_mi_file);
+  }
+
+  if ( -f $master_sh )
+  {
+    if ( $::glob_win32_perl )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No tests with sh scripts on Windows";
+      return;
+    }
+    else
+    {
+      $tinfo->{'master_sh'}= $master_sh;
+    }
+  }
+
+  if ( -f $slave_sh )
+  {
+    if ( $::glob_win32_perl )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No tests with sh scripts on Windows";
+      return;
+    }
+    else
+    {
+      $tinfo->{'slave_sh'}= $slave_sh;
+    }
+  }
+
+  if ( -f $im_opt_file )
+  {
+    $tinfo->{'im_opts'} = mtr_get_opts_from_file($im_opt_file);
+  }
+  else
+  {
+    $tinfo->{'im_opts'} = [];
+  }
+
+  # FIXME why this late?
+  my $marked_as_disabled= 0;
+  if ( $disabled->{$tname} )
+  {
+    $marked_as_disabled= 1;
+    $tinfo->{'comment'}= $disabled->{$tname};
+  }
+
+  if ( -f $disabled_file )
+  {
+    $marked_as_disabled= 1;
+    $tinfo->{'comment'}= mtr_fromfile($disabled_file);
+  }
+
+  # If test was marked as disabled, either opt_enable_disabled is off and then
+  # we skip this test, or it is on and then we run this test but warn
+
+  if ( $marked_as_disabled )
+  {
+    if ( $::opt_enable_disabled )
+    {
+      $tinfo->{'dont_skip_though_disabled'}= 1;
+    }
+    else
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'disable'}= 1;   # Sub type of 'skip'
+      return;
+    }
+  }
+
+  if ( $component_id eq 'im' )
+  {
+    if ( $::glob_use_embedded_server )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No IM with embedded server";
+      return;
+    }
+    elsif ( $::opt_ps_protocol )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No IM with --ps-protocol";
+      return;
+    }
+    elsif ( $::opt_skip_im )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No IM tests(--skip-im)";
+      return;
+    }
+  }
+  else
+  {
+    mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
+
+    if ( defined $::used_default_engine )
+    {
+      # Different default engine is used
+      # tag test to require that engine
+      $tinfo->{'ndb_test'}= 1
+	if ( $::used_default_engine =~ /^ndb/i );
+
+      $tinfo->{'innodb_test'}= 1
+	if ( $::used_default_engine =~ /^innodb/i );
+    }
+
+    #enable federated for this test
+    if ($tinfo->{'federated_test'})
+    {
+      push(@{$tinfo->{'master_opt'}}, "--loose-federated");
+      push(@{$tinfo->{'slave_opt'}}, "--loose-federated");
+    }
+
+    if ( $tinfo->{'big_test'} and ! $::opt_big_test )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test need 'big-test' option";
+      return;
+    }
+
+    if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test need 'ndb_extra' option";
+      return;
+    }
+
+    if ( $tinfo->{'require_manager'} )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test need the _old_ manager(to be removed)";
+      return;
+    }
+
+    if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test need debug binaries";
+      return;
+    }
+
+    if ( $tinfo->{'ndb_test'} )
+    {
+      # This is a NDB test
+      if ( ! $::glob_ndbcluster_supported )
+      {
+	# Ndb is not supported, skip it
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "No ndbcluster support";
+	return;
+      }
+      elsif ( $::opt_skip_ndbcluster )
+      {
+	# All ndb test's should be skipped
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
+	return;
+      }
+      # Ndb tests run with two mysqld masters
+      $tinfo->{'master_num'}= 2;
+    }
+    else
+    {
+      # This is not a ndb test
+      if ( $::opt_with_ndbcluster_only )
+      {
+	# Only the ndb test should be run, all other should be skipped
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "Only ndbcluster tests(--with-ndbcluster-only)";
+	return;
+      }
+    }
+
+    if ( $tinfo->{'innodb_test'} )
+    {
+      # This is a test that need innodb
+      if ( $::mysqld_variables{'innodb'} ne "TRUE" )
+      {
+	# innodb is not supported, skip it
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "No innodb support";
+	return;
+      }
+    }
+
+    if ( $tinfo->{'need_binlog'} )
+    {
+      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
+      {
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "Test need binlog";
+	return;
+      }
+    }
+    else
+    {
+      if ( $::mysql_version_id >= 50100 )
+      {
+	# Test does not need binlog, add --skip-binlog to
+	# the options used when starting it
+	push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+      }
+    }
+
+  }
+}
+
+
+# List of tags in the .test files that if found should set
+# the specified value in "tinfo"
+our @tags=
+(
+
+ ["include/have_binlog_format_row.inc", "binlog_formats", ["row"]],
+ ["include/have_binlog_format_statement.inc", "binlog_formats", ["statement"]],
+ ["include/have_binlog_format_mixed.inc", "binlog_formats", ["mixed"]],
+ ["include/have_binlog_format_mixed_or_row.inc",
+  "binlog_formats", ["mixed", "row"]],
+ ["include/have_binlog_format_mixed_or_statement.inc",
+  "binlog_formats", ["mixed", "statement"]],
+ ["include/have_binlog_format_row_or_statement.inc",
+  "binlog_formats", ["row", "statement"]],
+
+ ["include/have_innodb.inc", "innodb_test", 1],
+ ["include/have_log_bin.inc", "need_binlog", 1],
+ ["include/big_test.inc", "big_test", 1],
+ ["include/have_debug.inc", "need_debug", 1],
+ ["include/have_ndb.inc", "ndb_test", 1],
+ ["include/have_multi_ndb.inc", "ndb_test", 1],
+ ["include/have_ndb_extra.inc", "ndb_extra", 1],
+ ["include/ndb_master-slave.inc", "ndb_test", 1],
+ ["require_manager", "require_manager", 1],
+ ["include/federated.inc", "federated_test", 1],
+ ["include/have_federated_db.inc", "federated_test", 1],
+);
+
+sub mtr_options_from_test_file($$) {
+  my $tinfo= shift;
+  my $file= shift;
+  #mtr_verbose("$file");
+  my $F= IO::File->new($file) or mtr_error("can't open file \"$file\": $!");
+
+  while ( my $line= <$F> )
+  {
+
+    # Skip line if it start's with #
+    next if ( $line =~ /^#/ );
+
+    # Match this line against tag in "tags" array
+    foreach my $tag (@tags)
+    {
+      if ( index($line, $tag->[0]) >= 0 )
+      {
+    	  # Tag matched, assign value to "tinfo"
+        $tinfo->{"$tag->[1]"}= $tag->[2];
+      }
+    }
+
+    # If test sources another file, open it as well
+    if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ or
+	 $line =~ /^([[:space:]]*)source(.*);$/ )
+    {
+      my $value= $2;
+      $value =~ s/^\s+//;  # Remove leading space
+      $value =~ s/[[:space:]]+$//;  # Remove ending space
+
+      my $sourced_file= "$::glob_mysql_test_dir/$value";
+      if ( -f $sourced_file )
+      {
+	# Only source the file if it exists, we may get
+	# false positives in the regexes above if someone
+	# writes "source nnnn;" in a test case(such as mysqltest.test)
+	mtr_options_from_test_file($tinfo, $sourced_file);
+      }
+    }
+  }
+}
+
+
+sub print_testcases {
+  my (@cases)= @_;
+
+  print "=" x 60, "\n";
+  foreach my $test (@cases){
+    print "[", $test->{name}, "]", "\n";
+    while ((my ($key, $value)) = each(%$test)) {
+      print " ", $key, "=";
+      if (ref $value eq "ARRAY") {
+	print join(", ", @$value);
+      } else {
+	print $value;
+      }
+      print "\n";
+    }
+    print "\n";
+  }
+  print "=" x 60, "\n";
+}
+
+
+1;
diff --git a/mysql-test/lib/v1/mtr_gcov.pl b/mysql-test/lib/v1/mtr_gcov.pl
new file mode 100644
index 00000000000..a2de1fcbdff
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_gcov.pl
@@ -0,0 +1,74 @@
+# -*- cperl -*-
+# Copyright (C) 2004, 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+
+# These are not to be prefixed with "mtr_"
+
+sub gcov_prepare ();
+sub gcov_collect ();
+
+##############################################################################
+#
+#  
+#
+##############################################################################
+
+sub gcov_prepare () {
+
+  `find $::glob_basedir -name \*.gcov \
+    -or -name \*.da | xargs rm`;
+}
+
+# Used by gcov
+our @mysqld_src_dirs=
+  (
+   "strings",
+   "mysys",
+   "include",
+   "extra",
+   "regex",
+   "isam",
+   "merge",
+   "myisam",
+   "myisammrg",
+   "heap",
+   "sql",
+  );
+
+sub gcov_collect () {
+
+  print "Collecting source coverage info...\n";
+  -f $::opt_gcov_msg and unlink($::opt_gcov_msg);
+  -f $::opt_gcov_err and unlink($::opt_gcov_err);
+  foreach my $d ( @mysqld_src_dirs )
+  {
+    chdir("$::glob_basedir/$d");
+    foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) )
+    {
+      `$::opt_gcov $f 2>>$::opt_gcov_err  >>$::opt_gcov_msg`;
+    }
+    chdir($::glob_mysql_test_dir);
+  }
+  print "gcov info in $::opt_gcov_msg, errors in $::opt_gcov_err\n";
+}
+
+
+1;
diff --git a/mysql-test/lib/v1/mtr_gprof.pl b/mysql-test/lib/v1/mtr_gprof.pl
new file mode 100644
index 00000000000..f6615301dd7
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_gprof.pl
@@ -0,0 +1,64 @@
+# -*- cperl -*-
+# Copyright (C) 2004 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+
+# These are not to be prefixed with "mtr_"
+
+sub gprof_prepare ();
+sub gprof_collect ();
+
+##############################################################################
+#
+#  
+#
+##############################################################################
+
+sub gprof_prepare () {
+
+  rmtree($::opt_gprof_dir);
+  mkdir($::opt_gprof_dir);
+}
+
+# FIXME what about master1 and slave1?!
+sub gprof_collect () {
+
+  if ( -f "$::master->[0]->{'path_myddir'}/gmon.out" )
+  {
+    # FIXME check result code?!
+    mtr_run("gprof",
+            [$::exe_master_mysqld,
+             "$::master->[0]->{'path_myddir'}/gmon.out"],
+            $::opt_gprof_master, "", "", "");
+    print "Master execution profile has been saved in $::opt_gprof_master\n";
+  }
+  if ( -f "$::slave->[0]->{'path_myddir'}/gmon.out" )
+  {
+    # FIXME check result code?!
+    mtr_run("gprof",
+            [$::exe_slave_mysqld,
+             "$::slave->[0]->{'path_myddir'}/gmon.out"],
+            $::opt_gprof_slave, "", "", "");
+    print "Slave execution profile has been saved in $::opt_gprof_slave\n";
+  }
+}
+
+
+1;
diff --git a/mysql-test/lib/v1/mtr_im.pl b/mysql-test/lib/v1/mtr_im.pl
new file mode 100644
index 00000000000..c8e332498d7
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_im.pl
@@ -0,0 +1,775 @@
+# -*- cperl -*-
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+
+# Private IM-related operations.
+
+sub mtr_im_kill_process ($$$$);
+sub mtr_im_load_pids ($);
+sub mtr_im_terminate ($);
+sub mtr_im_check_alive ($);
+sub mtr_im_check_main_alive ($);
+sub mtr_im_check_angel_alive ($);
+sub mtr_im_check_mysqlds_alive ($);
+sub mtr_im_check_mysqld_alive ($);
+sub mtr_im_cleanup ($);
+sub mtr_im_rm_file ($);
+sub mtr_im_errlog ($);
+sub mtr_im_kill ($);
+sub mtr_im_wait_for_connection ($$$);
+sub mtr_im_wait_for_mysqld($$$);
+
+# Public IM-related operations.
+
+sub mtr_im_start ($$);
+sub mtr_im_stop ($);
+
+##############################################################################
+#
+#  Private operations.
+#
+##############################################################################
+
+sub mtr_im_kill_process ($$$$) {
+  my $pid_lst= shift;
+  my $signal= shift;
+  my $total_retries= shift;
+  my $timeout= shift;
+
+  my %pids;
+
+  foreach my $pid ( @{$pid_lst} )
+  {
+    $pids{$pid}= 1;
+  }
+
+  for ( my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt )
+  {
+    foreach my $pid ( keys %pids )
+    {
+      mtr_debug("Sending $signal to $pid...");
+
+      kill($signal, $pid);
+
+      unless ( kill (0, $pid) )
+      {
+        mtr_debug("Process $pid died.");
+        delete $pids{$pid};
+      }
+    }
+
+    return if scalar keys %pids == 0;
+
+    mtr_debug("Sleeping $timeout second(s) waiting for processes to die...");
+
+    sleep($timeout);
+  }
+
+  mtr_debug("Process(es) " .
+            join(' ', keys %pids) .
+            " is still alive after $total_retries " .
+            "of sending signal $signal.");
+}
+
+###########################################################################
+
+sub mtr_im_load_pids($) {
+  my $im= shift;
+
+  mtr_debug("Loading PID files...");
+
+  # Obtain mysqld-process pids.
+
+  my $instances = $im->{'instances'};
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    mtr_debug("IM-guarded mysqld[$idx] PID file: '" .
+              $instances->[$idx]->{'path_pid'} . "'.");
+
+    my $mysqld_pid;
+
+    if ( -r $instances->[$idx]->{'path_pid'} )
+    {
+      $mysqld_pid= mtr_get_pid_from_file($instances->[$idx]->{'path_pid'});
+      mtr_debug("IM-guarded mysqld[$idx] PID: $mysqld_pid.");
+    }
+    else
+    {
+      $mysqld_pid= undef;
+      mtr_debug("IM-guarded mysqld[$idx]: no PID file.");
+    }
+
+    $instances->[$idx]->{'pid'}= $mysqld_pid;
+  }
+
+  # Re-read Instance Manager PIDs from the file, since during tests Instance
+  # Manager could have been restarted, so its PIDs could have been changed.
+
+  #   - IM-main
+
+  mtr_debug("IM-main PID file: '$im->{path_pid}'.");
+
+  if ( -f $im->{'path_pid'} )
+  {
+    $im->{'pid'} =
+      mtr_get_pid_from_file($im->{'path_pid'});
+
+    mtr_debug("IM-main PID: $im->{pid}.");
+  }
+  else
+  {
+    mtr_debug("IM-main: no PID file.");
+    $im->{'pid'}= undef;
+  }
+
+  #   - IM-angel
+
+  mtr_debug("IM-angel PID file: '$im->{path_angel_pid}'.");
+
+  if ( -f $im->{'path_angel_pid'} )
+  {
+    $im->{'angel_pid'} =
+      mtr_get_pid_from_file($im->{'path_angel_pid'});
+
+    mtr_debug("IM-angel PID: $im->{'angel_pid'}.");
+  }
+  else
+  {
+    mtr_debug("IM-angel: no PID file.");
+    $im->{'angel_pid'} = undef;
+  }
+}
+
+###########################################################################
+
+sub mtr_im_terminate($) {
+  my $im= shift;
+
+  # Load pids from pid-files. We should do it first of all, because IM deletes
+  # them on shutdown.
+
+  mtr_im_load_pids($im);
+
+  mtr_debug("Shutting Instance Manager down...");
+
+  # Ignoring SIGCHLD so that all children could rest in peace.
+
+  start_reap_all();
+
+  # Send SIGTERM to IM-main.
+
+  if ( defined $im->{'pid'} )
+  {
+    mtr_debug("IM-main pid: $im->{pid}.");
+    mtr_debug("Stopping IM-main...");
+
+    mtr_im_kill_process([ $im->{'pid'} ], 'TERM', 10, 1);
+  }
+  else
+  {
+    mtr_debug("IM-main pid: n/a.");
+  }
+
+  # If IM-angel was alive, wait for it to die.
+
+  if ( defined $im->{'angel_pid'} )
+  {
+    mtr_debug("IM-angel pid: $im->{'angel_pid'}.");
+    mtr_debug("Waiting for IM-angel to die...");
+
+    my $total_attempts= 10;
+
+    for ( my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt )
+    {
+      unless ( kill (0, $im->{'angel_pid'}) )
+      {
+        mtr_debug("IM-angel died.");
+        last;
+      }
+
+      sleep(1);
+    }
+  }
+  else
+  {
+    mtr_debug("IM-angel pid: n/a.");
+  }
+
+  stop_reap_all();
+
+  # Re-load PIDs.
+
+  mtr_im_load_pids($im);
+}
+
+###########################################################################
+
+sub mtr_im_check_alive($) {
+  my $im= shift;
+
+  mtr_debug("Checking whether IM-components are alive...");
+
+  return 1 if mtr_im_check_main_alive($im);
+
+  return 1 if mtr_im_check_angel_alive($im);
+
+  return 1 if mtr_im_check_mysqlds_alive($im);
+
+  return 0;
+}
+
+###########################################################################
+
+sub mtr_im_check_main_alive($) {
+  my $im= shift;
+
+  # Check that the process, that we know to be IM's, is dead.
+
+  if ( defined $im->{'pid'} )
+  {
+    if ( kill (0, $im->{'pid'}) )
+    {
+      mtr_debug("IM-main (PID: $im->{pid}) is alive.");
+      return 1;
+    }
+    else
+    {
+      mtr_debug("IM-main (PID: $im->{pid}) is dead.");
+    }
+  }
+  else
+  {
+    mtr_debug("No PID file for IM-main.");
+  }
+
+  # Check that IM does not accept client connections.
+
+  if ( mtr_ping_port($im->{'port'}) )
+  {
+    mtr_debug("IM-main (port: $im->{port}) " .
+              "is accepting connections.");
+
+    mtr_im_errlog("IM-main is accepting connections on port " .
+                  "$im->{port}, but there is no " .
+                  "process information.");
+    return 1;
+  }
+  else
+  {
+    mtr_debug("IM-main (port: $im->{port}) " .
+              "does not accept connections.");
+    return 0;
+  }
+}
+
+###########################################################################
+
+sub mtr_im_check_angel_alive($) {
+  my $im= shift;
+
+  # Check that the process, that we know to be the Angel, is dead.
+
+  if ( defined $im->{'angel_pid'} )
+  {
+    if ( kill (0, $im->{'angel_pid'}) )
+    {
+      mtr_debug("IM-angel (PID: $im->{angel_pid}) is alive.");
+      return 1;
+    }
+    else
+    {
+      mtr_debug("IM-angel (PID: $im->{angel_pid}) is dead.");
+      return 0;
+    }
+  }
+  else
+  {
+    mtr_debug("No PID file for IM-angel.");
+    return 0;
+  }
+}
+
+###########################################################################
+
+sub mtr_im_check_mysqlds_alive($) {
+  my $im= shift;
+
+  mtr_debug("Checking for IM-guarded mysqld instances...");
+
+  my $instances = $im->{'instances'};
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    mtr_debug("Checking mysqld[$idx]...");
+
+    return 1
+      if mtr_im_check_mysqld_alive($instances->[$idx]);
+  }
+}
+
+###########################################################################
+
+sub mtr_im_check_mysqld_alive($) {
+  my $mysqld_instance= shift;
+
+  # Check that the process is dead.
+
+  if ( defined $mysqld_instance->{'pid'} )
+  {
+    if ( kill (0, $mysqld_instance->{'pid'}) )
+    {
+      mtr_debug("Mysqld instance (PID: $mysqld_instance->{pid}) is alive.");
+      return 1;
+    }
+    else
+    {
+      mtr_debug("Mysqld instance (PID: $mysqld_instance->{pid}) is dead.");
+    }
+  }
+  else
+  {
+    mtr_debug("No PID file for mysqld instance.");
+  }
+
+  # Check that mysqld does not accept client connections.
+
+  if ( mtr_ping_port($mysqld_instance->{'port'}) )
+  {
+    mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " .
+              "is accepting connections.");
+
+    mtr_im_errlog("Mysqld is accepting connections on port " .
+                  "$mysqld_instance->{port}, but there is no " .
+                  "process information.");
+    return 1;
+  }
+  else
+  {
+    mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " .
+              "does not accept connections.");
+    return 0;
+  }
+}
+
+###########################################################################
+
+sub mtr_im_cleanup($) {
+  my $im= shift;
+
+  mtr_im_rm_file($im->{'path_pid'});
+  mtr_im_rm_file($im->{'path_sock'});
+
+  mtr_im_rm_file($im->{'path_angel_pid'});
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    mtr_im_rm_file($im->{'instances'}->[$idx]->{'path_pid'});
+    mtr_im_rm_file($im->{'instances'}->[$idx]->{'path_sock'});
+  }
+}
+
+###########################################################################
+
+sub mtr_im_rm_file($)
+{
+  my $file_path= shift;
+
+  if ( -f $file_path )
+  {
+    mtr_debug("Removing '$file_path'...");
+
+    unless ( unlink($file_path) )
+    {
+      mtr_warning("Can not remove '$file_path'.")
+    }
+  }
+  else
+  {
+    mtr_debug("File '$file_path' does not exist already.");
+  }
+}
+
+###########################################################################
+
+sub mtr_im_errlog($) {
+  my $msg= shift;
+
+  # Complain in error log so that a warning will be shown.
+  # 
+  # TODO: unless BUG#20761 is fixed, we will print the warning to stdout, so
+  # that it can be seen on console and does not produce pushbuild error.
+
+  # my $errlog= "$opt_vardir/log/mysql-test-run.pl.err";
+  # 
+  # open (ERRLOG, ">>$errlog") ||
+  #   mtr_error("Can not open error log ($errlog)");
+  # 
+  # my $ts= localtime();
+  # print ERRLOG
+  #   "Warning: [$ts] $msg\n";
+  # 
+  # close ERRLOG;
+
+  my $ts= localtime();
+  print "Warning: [$ts] $msg\n";
+}
+
+###########################################################################
+
+sub mtr_im_kill($) {
+  my $im= shift;
+
+  # Re-load PIDs. That can be useful because some processes could have been
+  # restarted.
+
+  mtr_im_load_pids($im);
+
+  # Ignoring SIGCHLD so that all children could rest in peace.
+
+  start_reap_all();
+
+  # Kill IM-angel first of all.
+
+  if ( defined $im->{'angel_pid'} )
+  {
+    mtr_debug("Killing IM-angel (PID: $im->{angel_pid})...");
+    mtr_im_kill_process([ $im->{'angel_pid'} ], 'KILL', 10, 1)
+  }
+  else
+  {
+    mtr_debug("IM-angel is dead.");
+  }
+
+  # Re-load PIDs again.
+
+  mtr_im_load_pids($im);
+
+  # Kill IM-main.
+  
+  if ( defined $im->{'pid'} )
+  {
+    mtr_debug("Killing IM-main (PID: $im->pid})...");
+    mtr_im_kill_process([ $im->{'pid'} ], 'KILL', 10, 1);
+  }
+  else
+  {
+    mtr_debug("IM-main is dead.");
+  }
+
+  # Re-load PIDs again.
+
+  mtr_im_load_pids($im);
+
+  # Kill guarded mysqld instances.
+
+  my @mysqld_pids;
+
+  mtr_debug("Collecting PIDs of mysqld instances to kill...");
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    my $pid= $im->{'instances'}->[$idx]->{'pid'};
+
+    unless ( defined $pid )
+    {
+      next;
+    }
+
+    mtr_debug("  - IM-guarded mysqld[$idx] PID: $pid.");
+
+    push (@mysqld_pids, $pid);
+  }
+
+  if ( scalar @mysqld_pids > 0 )
+  {
+    mtr_debug("Killing IM-guarded mysqld instances...");
+    mtr_im_kill_process(\@mysqld_pids, 'KILL', 10, 1);
+  }
+
+  # That's all.
+
+  stop_reap_all();
+}
+
+##############################################################################
+
+sub mtr_im_wait_for_connection($$$) {
+  my $im= shift;
+  my $total_attempts= shift;
+  my $connect_timeout= shift;
+
+  mtr_debug("Waiting for IM on port $im->{port} " .
+            "to start accepting connections...");
+
+  for ( my $cur_attempt= 1; $cur_attempt <= $total_attempts; ++$cur_attempt )
+  {
+    mtr_debug("Trying to connect to IM ($cur_attempt of $total_attempts)...");
+
+    if ( mtr_ping_port($im->{'port'}) )
+    {
+      mtr_debug("IM is accepting connections " .
+                "on port $im->{port}.");
+      return 1;
+    }
+
+    mtr_debug("Sleeping $connect_timeout...");
+    sleep($connect_timeout);
+  }
+
+  mtr_debug("IM does not accept connections " .
+            "on port $im->{port} after " .
+            ($total_attempts * $connect_timeout) . " seconds.");
+
+  return 0;
+}
+
+##############################################################################
+
+sub mtr_im_wait_for_mysqld($$$) {
+  my $mysqld= shift;
+  my $total_attempts= shift;
+  my $connect_timeout= shift;
+
+  mtr_debug("Waiting for IM-guarded mysqld on port $mysqld->{port} " .
+            "to start accepting connections...");
+
+  for ( my $cur_attempt= 1; $cur_attempt <= $total_attempts; ++$cur_attempt )
+  {
+    mtr_debug("Trying to connect to mysqld " .
+              "($cur_attempt of $total_attempts)...");
+
+    if ( mtr_ping_port($mysqld->{'port'}) )
+    {
+      mtr_debug("Mysqld is accepting connections " .
+                "on port $mysqld->{port}.");
+      return 1;
+    }
+
+    mtr_debug("Sleeping $connect_timeout...");
+    sleep($connect_timeout);
+  }
+
+  mtr_debug("Mysqld does not accept connections " .
+            "on port $mysqld->{port} after " .
+            ($total_attempts * $connect_timeout) . " seconds.");
+
+  return 0;
+}
+
+##############################################################################
+#
+#  Public operations.
+#
+##############################################################################
+
+sub mtr_im_start($$) {
+  my $im = shift;
+  my $opts = shift;
+
+  mtr_debug("Starting Instance Manager...");
+
+  my $args;
+  mtr_init_args(\$args);
+  mtr_add_arg($args, "--defaults-file=%s", $im->{'defaults_file'});
+
+  foreach my $opt ( @{$opts} )
+  {
+    mtr_add_arg($args, $opt);
+  }
+
+  $im->{'spawner_pid'} =
+    mtr_spawn(
+      $::exe_im,                        # path to the executable
+      $args,                            # cmd-line args
+      '',                               # stdin
+      $im->{'path_log'},                # stdout
+      $im->{'path_err'},                # stderr
+      '',                               # pid file path (not used)
+      { append_log_file => 1 }          # append log files
+      );
+
+  unless ( $im->{'spawner_pid'} )
+  {
+    mtr_error('Could not start Instance Manager.')
+  }
+
+  # Instance Manager can be run in daemon mode. In this case, it creates
+  # several processes and the parent process, created by mtr_spawn(), exits just
+  # after start. So, we have to obtain Instance Manager PID from the PID file.
+
+  mtr_debug("Waiting for IM to create PID file (" .
+            "path: '$im->{path_pid}'; " .
+            "timeout: $im->{start_timeout})...");
+
+  unless ( sleep_until_file_created($im->{'path_pid'},
+                                    $im->{'start_timeout'},
+                                    -1) ) # real PID is still unknown
+  {
+    mtr_debug("IM has not created PID file in $im->{start_timeout} secs.");
+    mtr_debug("Aborting test suite...");
+
+    mtr_kill_leftovers();
+
+    mtr_report("IM has not created PID file in $im->{start_timeout} secs.");
+    return 0;
+  }
+
+  $im->{'pid'}= mtr_get_pid_from_file($im->{'path_pid'});
+
+  mtr_debug("Instance Manager started. PID: $im->{pid}.");
+
+  # Wait until we can connect to IM.
+
+  my $IM_CONNECT_TIMEOUT= 30;
+
+  unless ( mtr_im_wait_for_connection($im,
+                                      $IM_CONNECT_TIMEOUT, 1) )
+  {
+    mtr_debug("Can not connect to Instance Manager " .
+              "in $IM_CONNECT_TIMEOUT seconds after start.");
+    mtr_debug("Aborting test suite...");
+
+    mtr_kill_leftovers();
+
+    mtr_report("Can not connect to Instance Manager " .
+               "in $IM_CONNECT_TIMEOUT seconds after start.");
+    return 0;
+  }
+
+  # Wait for IM to start guarded instances:
+  #   - wait for PID files;
+
+  mtr_debug("Waiting for guarded mysqlds instances to create PID files...");
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    my $mysqld= $im->{'instances'}->[$idx];
+
+    if ( exists $mysqld->{'nonguarded'} )
+    {
+      next;
+    }
+
+    mtr_debug("Waiting for mysqld[$idx] to create PID file (" .
+              "path: '$mysqld->{path_pid}'; " .
+              "timeout: $mysqld->{start_timeout})...");
+
+    unless ( sleep_until_file_created($mysqld->{'path_pid'},
+                                      $mysqld->{'start_timeout'},
+                                      -1) ) # real PID is still unknown
+    {
+      mtr_debug("mysqld[$idx] has not created PID file in " .
+                 "$mysqld->{start_timeout} secs.");
+      mtr_debug("Aborting test suite...");
+
+      mtr_kill_leftovers();
+
+      mtr_report("mysqld[$idx] has not created PID file in " .
+                 "$mysqld->{start_timeout} secs.");
+      return 0;
+    }
+
+    mtr_debug("PID file for mysqld[$idx] ($mysqld->{path_pid} created.");
+  }
+
+  # Wait until we can connect to guarded mysqld-instances
+  # (in other words -- wait for IM to start guarded instances).
+
+  mtr_debug("Waiting for guarded mysqlds to start accepting connections...");
+
+  for ( my $idx= 0; $idx < 2; ++$idx )
+  {
+    my $mysqld= $im->{'instances'}->[$idx];
+
+    if ( exists $mysqld->{'nonguarded'} )
+    {
+      next;
+    }
+
+    mtr_debug("Waiting for mysqld[$idx] to accept connection...");
+
+    unless ( mtr_im_wait_for_mysqld($mysqld, 30, 1) )
+    {
+      mtr_debug("Can not connect to mysqld[$idx] " .
+                "in $IM_CONNECT_TIMEOUT seconds after start.");
+      mtr_debug("Aborting test suite...");
+
+      mtr_kill_leftovers();
+
+      mtr_report("Can not connect to mysqld[$idx] " .
+                 "in $IM_CONNECT_TIMEOUT seconds after start.");
+      return 0;
+    }
+
+    mtr_debug("mysqld[$idx] started.");
+  }
+
+  mtr_debug("Instance Manager and its components are up and running.");
+
+  return 1;
+}
+
+##############################################################################
+
+sub mtr_im_stop($) {
+  my $im= shift;
+
+  mtr_debug("Stopping Instance Manager...");
+
+  # Try graceful shutdown.
+
+  mtr_im_terminate($im);
+
+  # Check that all processes died.
+
+  unless ( mtr_im_check_alive($im) )
+  {
+    mtr_debug("Instance Manager has been stopped successfully.");
+    mtr_im_cleanup($im);
+    return 1;
+  }
+
+  # Instance Manager don't want to die. We should kill it.
+
+  mtr_im_errlog("Instance Manager did not shutdown gracefully.");
+
+  mtr_im_kill($im);
+
+  # Check again that all IM-related processes have been killed.
+
+  my $im_is_alive= mtr_im_check_alive($im);
+
+  mtr_im_cleanup($im);
+
+  if ( $im_is_alive )
+  {
+    mtr_debug("Can not kill Instance Manager or its children.");
+    return 0;
+  }
+
+  mtr_debug("Instance Manager has been killed successfully.");
+  return 1;
+}
+
+###########################################################################
+
+1;
diff --git a/mysql-test/lib/v1/mtr_io.pl b/mysql-test/lib/v1/mtr_io.pl
new file mode 100644
index 00000000000..aa671c0f4f7
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_io.pl
@@ -0,0 +1,218 @@
+# -*- cperl -*-
+# Copyright (C) 2004-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+
+sub mtr_get_pid_from_file ($);
+sub mtr_get_opts_from_file ($);
+sub mtr_fromfile ($);
+sub mtr_tofile ($@);
+sub mtr_tonewfile($@);
+sub mtr_lastlinefromfile($);
+sub mtr_appendfile_to_file ($$);
+sub mtr_grab_file($);
+
+
+##############################################################################
+#
+#  
+#
+##############################################################################
+
+sub mtr_get_pid_from_file ($) {
+  my $pid_file_path=  shift;
+  my $TOTAL_ATTEMPTS= 30;
+  my $timeout= 1;
+
+  # We should read from the file until we get correct pid. As it is
+  # stated in BUG#21884, pid file can be empty at some moment. So, we should
+  # read it until we get valid data.
+
+  for (my $cur_attempt= 1; $cur_attempt <= $TOTAL_ATTEMPTS; ++$cur_attempt)
+  {
+    mtr_debug("Reading pid file '$pid_file_path' " .
+              "($cur_attempt of $TOTAL_ATTEMPTS)...");
+
+    open(FILE, '<', $pid_file_path)
+      or mtr_error("can't open file \"$pid_file_path\": $!");
+
+    # Read pid number from file
+    my $pid= <FILE>;
+    chomp $pid;
+    close FILE;
+
+    return $pid if $pid=~ /^(\d+)/;
+
+    mtr_debug("Pid file '$pid_file_path' does not yet contain pid number.\n" .
+              "Sleeping $timeout second(s) more...");
+
+    sleep($timeout);
+  }
+
+  mtr_error("Pid file '$pid_file_path' is corrupted. " .
+            "Can not retrieve PID in " .
+            ($timeout * $TOTAL_ATTEMPTS) . " seconds.");
+}
+
+sub mtr_get_opts_from_file ($) {
+  my $file=  shift;
+
+  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
+  my @args;
+  while ( <FILE> )
+  {
+    chomp;
+
+    #    --set-variable=init_connect=set @a='a\\0c'
+    s/^\s+//;                           # Remove leading space
+    s/\s+$//;                           # Remove ending space
+
+    # This is strange, but we need to fill whitespace inside
+    # quotes with something, to remove later. We do this to
+    # be able to split on space. Else, we have trouble with
+    # options like 
+    #
+    #   --someopt="--insideopt1 --insideopt2"
+    #
+    # But still with this, we are not 100% sure it is right,
+    # we need a shell to do it right.
+
+#    print STDERR "\n";
+#    print STDERR "AAA: $_\n";
+
+    s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge;
+    s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge;
+    s/\'([^\'\"]*)\'/unspace($1,"\x0a")/ge;
+    s/\"([^\'\"]*)\"/unspace($1,"\x0b")/ge;
+
+#    print STDERR "BBB: $_\n";
+
+#    foreach my $arg (/(--?\w.*?)(?=\s+--?\w|$)/)
+
+    # FIXME ENV vars should be expanded!!!!
+
+    foreach my $arg (split(/[ \t]+/))
+    {
+      $arg =~ tr/\x11\x0a\x0b/ \'\"/;     # Put back real chars
+      # The outermost quotes has to go
+      $arg =~ s/^([^\'\"]*)\'(.*)\'([^\'\"]*)$/$1$2$3/
+        or $arg =~ s/^([^\'\"]*)\"(.*)\"([^\'\"]*)$/$1$2$3/;
+      $arg =~ s/\\\\/\\/g;
+
+      $arg =~ s/\$\{(\w+)\}/envsubst($1)/ge;
+      $arg =~ s/\$(\w+)/envsubst($1)/ge;
+
+#      print STDERR "ARG: $arg\n";
+      # Do not pass empty string since my_getopt is not capable to handle it.
+      if (length($arg))
+      {
+        push(@args, $arg)
+      }
+    }
+  }
+  close FILE;
+  return \@args;
+}
+
+sub envsubst {
+  my $string= shift;
+
+  if ( ! defined $ENV{$string} )
+  {
+    mtr_error("opt file referense \$$string that is unknown");
+  }
+
+  return $ENV{$string};
+}
+
+sub unspace {
+  my $string= shift;
+  my $quote=  shift;
+  $string =~ s/[ \t]/\x11/g;
+  return "$quote$string$quote";
+}
+
+# Read a whole file, stripping leading and trailing whitespace.
+sub mtr_fromfile ($) {
+  my $file=  shift;
+
+  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
+  my $text= join('', <FILE>);
+  close FILE;
+  $text =~ s/^\s+//;                    # Remove starting space, incl newlines
+  $text =~ s/\s+$//;                    # Remove ending space, incl newlines
+  return $text;
+}
+
+sub mtr_lastlinefromfile ($) {
+  my $file=  shift;
+  my $text;
+
+  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
+  while (my $line= <FILE>)
+  {
+    $text= $line;
+  }
+  close FILE;
+  return $text;
+}
+
+
+sub mtr_tofile ($@) {
+  my $file=  shift;
+
+  open(FILE,">>",$file) or mtr_error("can't open file \"$file\": $!");
+  print FILE join("", @_);
+  close FILE;
+}
+
+sub mtr_tonewfile ($@) {
+  my $file=  shift;
+
+  open(FILE,">",$file) or mtr_error("can't open file \"$file\": $!");
+  print FILE join("", @_);
+  close FILE;
+}
+
+sub mtr_appendfile_to_file ($$) {
+  my $from_file=  shift;
+  my $to_file=  shift;
+
+  open(TOFILE,">>",$to_file) or mtr_error("can't open file \"$to_file\": $!");
+  open(FROMFILE,"<",$from_file)
+    or mtr_error("can't open file \"$from_file\": $!");
+  print TOFILE while (<FROMFILE>);
+  close FROMFILE;
+  close TOFILE;
+}
+
+# Read a whole file verbatim.
+sub mtr_grab_file($) {
+  my $file= shift;
+  open(FILE, '<', $file)
+    or return undef;
+  local $/= undef;
+  my $data= scalar(<FILE>);
+  close FILE;
+  return $data;
+}
+
+
+1;
diff --git a/mysql-test/lib/v1/mtr_match.pl b/mysql-test/lib/v1/mtr_match.pl
new file mode 100644
index 00000000000..96aa43f4fa2
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_match.pl
@@ -0,0 +1,98 @@
+# -*- cperl -*-
+# Copyright (C) 2004-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+
+sub mtr_match_prefix ($$);
+sub mtr_match_extension ($$);
+sub mtr_match_any_exact ($$);
+
+##############################################################################
+#
+#  
+#
+##############################################################################
+
+# Match a prefix and return what is after the prefix
+
+sub mtr_match_prefix ($$) {
+  my $string= shift;
+  my $prefix= shift;
+
+  if ( $string =~ /^\Q$prefix\E(.*)$/ ) # strncmp
+  {
+    return $1;
+  }
+  else
+  {
+    return undef;		# NULL
+  }
+}
+
+
+# Match extension and return the name without extension
+
+sub mtr_match_extension ($$) {
+  my $file= shift;
+  my $ext=  shift;
+
+  if ( $file =~ /^(.*)\.\Q$ext\E$/ ) # strchr+strcmp or something
+  {
+    return $1;
+  }
+  else
+  {
+    return undef;                       # NULL
+  }
+}
+
+
+# Match a substring anywere in a string
+
+sub mtr_match_substring ($$) {
+  my $string= shift;
+  my $substring= shift;
+
+  if ( $string =~ /(.*)\Q$substring\E(.*)$/ ) # strncmp
+  {
+    return $1;
+  }
+  else
+  {
+    return undef;		# NULL
+  }
+}
+
+
+sub mtr_match_any_exact ($$) {
+  my $string= shift;
+  my $mlist=  shift;
+
+  foreach my $m (@$mlist)
+  {
+    if ( $string eq $m )
+    {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_misc.pl b/mysql-test/lib/v1/mtr_misc.pl
new file mode 100644
index 00000000000..0173e8b8572
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_misc.pl
@@ -0,0 +1,312 @@
+# -*- cperl -*-
+# Copyright (C) 2004-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+use File::Find;
+
+sub mtr_native_path($);
+sub mtr_init_args ($);
+sub mtr_add_arg ($$@);
+sub mtr_path_exists(@);
+sub mtr_script_exists(@);
+sub mtr_file_exists(@);
+sub mtr_exe_exists(@);
+sub mtr_exe_maybe_exists(@);
+sub mtr_copy_dir($$);
+sub mtr_rmtree($);
+sub mtr_same_opts($$);
+sub mtr_cmp_opts($$);
+
+##############################################################################
+#
+#  Misc
+#
+##############################################################################
+
+# Convert path to OS native format
+sub mtr_native_path($)
+{
+  my $path= shift;
+
+  # MySQL version before 5.0 still use cygwin, no need
+  # to convert path
+  return $path
+    if ($::mysql_version_id < 50000);
+
+  $path=~ s/\//\\/g
+    if ($::glob_win32);
+  return $path;
+}
+
+
+# FIXME move to own lib
+
+sub mtr_init_args ($) {
+  my $args = shift;
+  $$args = [];                            # Empty list
+}
+
+sub mtr_add_arg ($$@) {
+  my $args=   shift;
+  my $format= shift;
+  my @fargs = @_;
+
+  push(@$args, sprintf($format, @fargs));
+}
+
+##############################################################################
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
+sub mtr_path_exists (@) {
+  foreach my $path ( @_ )
+  {
+    return $path if -e $path;
+  }
+  if ( @_ == 1 )
+  {
+    mtr_error("Could not find $_[0]");
+  }
+  else
+  {
+    mtr_error("Could not find any of " . join(" ", @_));
+  }
+}
+
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
+sub mtr_script_exists (@) {
+  foreach my $path ( @_ )
+  {
+    if($::glob_win32)
+    {
+      return $path if -f $path;
+    }
+    else
+    {
+      return $path if -x $path;
+    }
+  }
+  if ( @_ == 1 )
+  {
+    mtr_error("Could not find $_[0]");
+  }
+  else
+  {
+    mtr_error("Could not find any of " . join(" ", @_));
+  }
+}
+
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
+sub mtr_file_exists (@) {
+  foreach my $path ( @_ )
+  {
+    return $path if -e $path;
+  }
+  return "";
+}
+
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
+sub mtr_exe_maybe_exists (@) {
+  my @path= @_;
+
+  map {$_.= ".exe"} @path if $::glob_win32;
+  map {$_.= ".nlm"} @path if $::glob_netware;
+  foreach my $path ( @path )
+  {
+    if($::glob_win32)
+    {
+      return $path if -f $path;
+    }
+    else
+    {
+      return $path if -x $path;
+    }
+  }
+  return "";
+}
+
+
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
+sub mtr_exe_exists (@) {
+  my @path= @_;
+  if (my $path= mtr_exe_maybe_exists(@path))
+  {
+    return $path;
+  }
+  # Could not find exe, show error
+  if ( @path == 1 )
+  {
+    mtr_error("Could not find $path[0]");
+  }
+  else
+  {
+    mtr_error("Could not find any of " . join(" ", @path));
+  }
+}
+
+
+sub mtr_copy_dir($$) {
+  my $from_dir= shift;
+  my $to_dir= shift;
+
+  # mtr_verbose("Copying from $from_dir to $to_dir");
+
+  mkpath("$to_dir");
+  opendir(DIR, "$from_dir")
+    or mtr_error("Can't find $from_dir$!");
+  for(readdir(DIR)) {
+    next if "$_" eq "." or "$_" eq "..";
+    if ( -d "$from_dir/$_" )
+    {
+      mtr_copy_dir("$from_dir/$_", "$to_dir/$_");
+      next;
+    }
+    copy("$from_dir/$_", "$to_dir/$_");
+  }
+  closedir(DIR);
+
+}
+
+
+sub mtr_rmtree($) {
+  my ($dir)= @_;
+  mtr_verbose("mtr_rmtree: $dir");
+
+  # Try to use File::Path::rmtree. Recent versions
+  # handles removal of directories and files that don't
+  # have full permissions, while older versions
+  # may have a problem with that and we use our own version
+
+  eval { rmtree($dir); };
+  if ( $@ ) {
+    mtr_warning("rmtree($dir) failed, trying with File::Find...");
+
+    my $errors= 0;
+
+    # chmod
+    find( {
+	   no_chdir => 1,
+	   wanted => sub {
+	     chmod(0777, $_)
+	       or mtr_warning("couldn't chmod(0777, $_): $!") and $errors++;
+	   }
+	  },
+	  $dir
+	);
+
+    # rm
+    finddepth( {
+	   no_chdir => 1,
+	   wanted => sub {
+	     my $file= $_;
+	     # Use special underscore (_) filehandle, caches stat info
+	     if (!-l $file and -d _ ) {
+	       rmdir($file) or
+		 mtr_warning("couldn't rmdir($file): $!") and $errors++;
+	     } else {
+	       unlink($file)
+		 or mtr_warning("couldn't unlink($file): $!") and $errors++;
+	     }
+	   }
+	  },
+	  $dir
+	);
+
+    mtr_error("Failed to remove '$dir'") if $errors;
+
+    mtr_report("OK, that worked!");
+  }
+}
+
+
+sub mtr_same_opts ($$) {
+  my $l1= shift;
+  my $l2= shift;
+  return mtr_cmp_opts($l1,$l2) == 0;
+}
+
+sub mtr_cmp_opts ($$) {
+  my $l1= shift;
+  my $l2= shift;
+
+  my @l1= @$l1;
+  my @l2= @$l2;
+
+  return -1 if @l1 < @l2;
+  return  1 if @l1 > @l2;
+
+  while ( @l1 )                         # Same length
+  {
+    my $e1= shift @l1;
+    my $e2= shift @l2;
+    my $cmp= ($e1 cmp $e2);
+    return $cmp if $cmp != 0;
+  }
+
+  return 0;                             # They are the same
+}
+
+#
+# Compare two arrays and put all unequal elements into a new one
+#
+sub mtr_diff_opts ($$) {
+  my $l1= shift;
+  my $l2= shift;
+  my $f;
+  my $l= [];
+  foreach my $e1 (@$l1) 
+  {    
+    $f= undef;
+    foreach my $e2 (@$l2) 
+    {
+      $f= 1 unless ($e1 ne $e2);
+    }
+    push(@$l, $e1) unless (defined $f);
+  }
+  foreach my $e2 (@$l2) 
+  {
+    $f= undef;
+    foreach my $e1 (@$l1) 
+    {
+      $f= 1 unless ($e1 ne $e2);
+    }
+    push(@$l, $e2) unless (defined $f);
+  }
+  return $l;
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl
new file mode 100644
index 00000000000..8fd900330da
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_process.pl
@@ -0,0 +1,1142 @@
+# -*- cperl -*-
+# Copyright (C) 2004-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use Socket;
+use Errno;
+use strict;
+
+use POSIX qw(WNOHANG SIGHUP);
+
+sub mtr_run ($$$$$$;$);
+sub mtr_spawn ($$$$$$;$);
+sub mtr_check_stop_servers ($);
+sub mtr_kill_leftovers ();
+sub mtr_wait_blocking ($);
+sub mtr_record_dead_children ();
+sub mtr_ndbmgm_start($$);
+sub mtr_mysqladmin_start($$$);
+sub mtr_exit ($);
+sub sleep_until_file_created ($$$);
+sub mtr_kill_processes ($);
+sub mtr_ping_with_timeout($);
+sub mtr_ping_port ($);
+
+# Local function
+sub spawn_impl ($$$$$$$);
+
+##############################################################################
+#
+#  Execute an external command
+#
+##############################################################################
+
+sub mtr_run ($$$$$$;$) {
+  my $path=       shift;
+  my $arg_list_t= shift;
+  my $input=      shift;
+  my $output=     shift;
+  my $error=      shift;
+  my $pid_file=   shift; # Not used
+  my $spawn_opts= shift;
+
+  return spawn_impl($path,$arg_list_t,'run',$input,$output,$error,
+    $spawn_opts);
+}
+
+sub mtr_run_test ($$$$$$;$) {
+  my $path=       shift;
+  my $arg_list_t= shift;
+  my $input=      shift;
+  my $output=     shift;
+  my $error=      shift;
+  my $pid_file=   shift; # Not used
+  my $spawn_opts= shift;
+
+  return spawn_impl($path,$arg_list_t,'test',$input,$output,$error,
+    $spawn_opts);
+}
+
+sub mtr_spawn ($$$$$$;$) {
+  my $path=       shift;
+  my $arg_list_t= shift;
+  my $input=      shift;
+  my $output=     shift;
+  my $error=      shift;
+  my $pid_file=   shift; # Not used
+  my $spawn_opts= shift;
+
+  return spawn_impl($path,$arg_list_t,'spawn',$input,$output,$error,
+    $spawn_opts);
+}
+
+
+
+sub spawn_impl ($$$$$$$) {
+  my $path=       shift;
+  my $arg_list_t= shift;
+  my $mode=       shift;
+  my $input=      shift;
+  my $output=     shift;
+  my $error=      shift;
+  my $spawn_opts= shift;
+
+  if ( $::opt_script_debug )
+  {
+    mtr_report("");
+    mtr_debug("-" x 73);
+    mtr_debug("STDIN  $input") if $input;
+    mtr_debug("STDOUT $output") if $output;
+    mtr_debug("STDERR $error") if $error;
+    mtr_debug("$mode: $path ", join(" ",@$arg_list_t));
+    mtr_debug("spawn options:");
+    if ($spawn_opts)
+    {
+      foreach my $key (sort keys %{$spawn_opts})
+      {
+        mtr_debug("  - $key: $spawn_opts->{$key}");
+      }
+    }
+    else
+    {
+      mtr_debug("  none");
+    }
+    mtr_debug("-" x 73);
+    mtr_report("");
+  }
+
+  mtr_error("Can't spawn with empty \"path\"") unless defined $path;
+
+
+ FORK:
+  {
+    my $pid= fork();
+
+    if ( ! defined $pid )
+    {
+      if ( $! == $!{EAGAIN} )           # See "perldoc Errno"
+      {
+        mtr_warning("Got EAGAIN from fork(), sleep 1 second and redo");
+        sleep(1);
+        redo FORK;
+      }
+
+      mtr_error("$path ($pid) can't be forked, error: $!");
+
+    }
+
+    if ( $pid )
+    {
+      select(STDOUT) if $::glob_win32_perl;
+      return spawn_parent_impl($pid,$mode,$path);
+    }
+    else
+    {
+      # Child, redirect output and exec
+
+      $SIG{INT}= 'DEFAULT';         # Parent do some stuff, we don't
+
+      my $log_file_open_mode = '>';
+
+      if ($spawn_opts and $spawn_opts->{'append_log_file'})
+      {
+        $log_file_open_mode = '>>';
+      }
+
+      if ( $output )
+      {
+	if ( $::glob_win32_perl )
+	{
+	  # Don't redirect stdout on ActiveState perl since this is
+          # just another thread in the same process.
+	}
+        elsif ( ! open(STDOUT,$log_file_open_mode,$output) )
+        {
+          mtr_child_error("can't redirect STDOUT to \"$output\": $!");
+        }
+      }
+
+      if ( $error )
+      {
+        if ( !$::glob_win32_perl and $output eq $error )
+        {
+          if ( ! open(STDERR,">&STDOUT") )
+          {
+            mtr_child_error("can't dup STDOUT: $!");
+          }
+        }
+        else
+        {
+          if ( ! open(STDERR,$log_file_open_mode,$error) )
+          {
+            mtr_child_error("can't redirect STDERR to \"$error\": $!");
+          }
+        }
+      }
+
+      if ( $input )
+      {
+        if ( ! open(STDIN,"<",$input) )
+        {
+          mtr_child_error("can't redirect STDIN to \"$input\": $!");
+        }
+      }
+
+      if ( ! exec($path,@$arg_list_t) )
+      {
+        mtr_child_error("failed to execute \"$path\": $!");
+      }
+      mtr_error("Should never come here 1!");
+    }
+    mtr_error("Should never come here 2!");
+  }
+  mtr_error("Should never come here 3!");
+}
+
+
+sub spawn_parent_impl {
+  my $pid=  shift;
+  my $mode= shift;
+  my $path= shift;
+
+  if ( $mode eq 'run' or $mode eq 'test' )
+  {
+    if ( $mode eq 'run' )
+    {
+      # Simple run of command, wait blocking for it to return
+      my $ret_pid= waitpid($pid,0);
+      if ( $ret_pid != $pid )
+      {
+	# The "simple" waitpid has failed, print debug info
+	# and try to handle the error
+        mtr_warning("waitpid($pid, 0) returned $ret_pid " .
+		    "when waiting for '$path', error: '$!'");
+	if ( $ret_pid == -1 )
+	{
+	  # waitpid returned -1, that would indicate the process
+	  # no longer exist and waitpid couldn't wait for it.
+	  return 1;
+	}
+	mtr_error("Error handling failed");
+      }
+
+      return mtr_process_exit_status($?);
+    }
+    else
+    {
+      # We run mysqltest and wait for it to return. But we try to
+      # catch dying mysqld processes as well.
+      #
+      # We do blocking waitpid() until we get the return from the
+      # "mysqltest" call. But if a mysqld process dies that we
+      # started, we take this as an error, and kill mysqltest.
+
+
+      my $exit_value= -1;
+      my $saved_exit_value;
+      my $ret_pid;                      # What waitpid() returns
+
+      while ( ($ret_pid= waitpid(-1,0)) != -1 )
+      {
+        # Someone terminated, don't know who. Collect
+        # status info first before $? is lost,
+        # but not $exit_value, this is flagged from
+
+        my $timer_name= mtr_timer_timeout($::glob_timers, $ret_pid);
+        if ( $timer_name )
+        {
+          if ( $timer_name eq "suite" )
+          {
+            # We give up here
+            # FIXME we should only give up the suite, not all of the run?
+            print STDERR "\n";
+            mtr_error("Test suite timeout");
+          }
+          elsif ( $timer_name eq "testcase" )
+          {
+            $saved_exit_value=  63;       # Mark as timeout
+            kill(9, $pid);                # Kill mysqltest
+            next;                         # Go on and catch the termination
+          }
+        }
+
+        if ( $ret_pid == $pid )
+        {
+          # We got termination of mysqltest, we are done
+          $exit_value= mtr_process_exit_status($?);
+          last;
+        }
+
+        # One of the child processes died, unless this was expected
+	# mysqltest should be killed and test aborted
+
+	check_expected_crash_and_restart($ret_pid);
+      }
+
+      if ( $ret_pid != $pid )
+      {
+        # We terminated the waiting because a "mysqld" process died.
+        # Kill the mysqltest process.
+	mtr_verbose("Kill mysqltest because another process died");
+        kill(9,$pid);
+
+        $ret_pid= waitpid($pid,0);
+
+        if ( $ret_pid != $pid )
+        {
+          mtr_error("$path ($pid) got lost somehow");
+        }
+      }
+
+      return $saved_exit_value || $exit_value;
+    }
+  }
+  else
+  {
+    # We spawned a process we don't wait for
+    return $pid;
+  }
+}
+
+
+# ----------------------------------------------------------------------
+# We try to emulate how an Unix shell calculates the exit code
+# ----------------------------------------------------------------------
+
+sub mtr_process_exit_status {
+  my $raw_status= shift;
+
+  if ( $raw_status & 127 )
+  {
+    return ($raw_status & 127) + 128;  # Signal num + 128
+  }
+  else
+  {
+    return $raw_status >> 8;           # Exit code
+  }
+}
+
+
+##############################################################################
+#
+#  Kill processes left from previous runs
+#
+##############################################################################
+
+
+# Kill all processes(mysqld, ndbd, ndb_mgmd and im) that would conflict with
+# this run
+# Make sure to remove the PID file, if any.
+# kill IM manager first, else it will restart the servers
+sub mtr_kill_leftovers () {
+
+  mtr_report("Killing Possible Leftover Processes");
+  mtr_debug("mtr_kill_leftovers(): started.");
+
+  my @kill_pids;
+  my %admin_pids;
+
+  foreach my $srv (@{$::master}, @{$::slave})
+  {
+    mtr_debug("  - mysqld " .
+              "(pid: $srv->{pid}; " .
+              "pid file: '$srv->{path_pid}'; " .
+              "socket: '$srv->{path_sock}'; ".
+              "port: $srv->{port})");
+
+    my $pid= mtr_mysqladmin_start($srv, "shutdown", 20);
+
+    # Save the pid of the mysqladmin process
+    $admin_pids{$pid}= 1;
+
+    push(@kill_pids,{
+		     pid      => $srv->{'pid'},
+		     pidfile  => $srv->{'path_pid'},
+		     sockfile => $srv->{'path_sock'},
+		     port     => $srv->{'port'},
+		    });
+    $srv->{'pid'}= 0; # Assume we are done with it
+  }
+
+  if ( ! $::opt_skip_ndbcluster )
+  {
+
+    foreach my $cluster (@{$::clusters})
+    {
+
+      # Don't shut down a "running" cluster
+      next if $cluster->{'use_running'};
+
+      mtr_debug("  - cluster " .
+		"(pid: $cluster->{pid}; " .
+		"pid file: '$cluster->{path_pid})");
+
+      my $pid= mtr_ndbmgm_start($cluster, "shutdown");
+
+      # Save the pid of the ndb_mgm process
+      $admin_pids{$pid}= 1;
+
+      push(@kill_pids,{
+		       pid      => $cluster->{'pid'},
+		       pidfile  => $cluster->{'path_pid'}
+		      });
+
+      $cluster->{'pid'}= 0; # Assume we are done with it
+
+      foreach my $ndbd (@{$cluster->{'ndbds'}})
+      {
+	mtr_debug("    - ndbd " .
+		  "(pid: $ndbd->{pid}; " .
+		  "pid file: '$ndbd->{path_pid})");
+
+	push(@kill_pids,{
+			 pid      => $ndbd->{'pid'},
+			 pidfile  => $ndbd->{'path_pid'},
+			});
+	$ndbd->{'pid'}= 0; # Assume we are done with it
+      }
+    }
+  }
+
+  # Wait for all the admin processes to complete
+  mtr_wait_blocking(\%admin_pids);
+
+  # If we trusted "mysqladmin --shutdown_timeout= ..." we could just
+  # terminate now, but we don't (FIXME should be debugged).
+  # So we try again to ping and at least wait the same amount of time
+  # mysqladmin would for all to die.
+
+  mtr_ping_with_timeout(\@kill_pids);
+
+  # We now have tried to terminate nice. We have waited for the listen
+  # port to be free, but can't really tell if the mysqld process died
+  # or not. We now try to find the process PID from the PID file, and
+  # send a kill to that process. Note that Perl let kill(0,@pids) be
+  # a way to just return the numer of processes the kernel can send
+  # signals to. So this can be used (except on Cygwin) to determine
+  # if there are processes left running that we cound out might exists.
+  #
+  # But still after all this work, all we know is that we have
+  # the ports free.
+
+  # We scan the "var/run/" directory for other process id's to kill
+
+  my $rundir= "$::opt_vardir/run";
+
+  mtr_debug("Processing PID files in directory '$rundir'...");
+
+  if ( -d $rundir )
+  {
+    opendir(RUNDIR, $rundir)
+      or mtr_error("can't open directory \"$rundir\": $!");
+
+    my @pids;
+
+    while ( my $elem= readdir(RUNDIR) )
+    {
+      # Only read pid from files that end with .pid
+      if ( $elem =~ /.*[.]pid$/)
+      {
+	my $pidfile= "$rundir/$elem";
+
+	if ( -f $pidfile )
+	{
+	  mtr_debug("Processing PID file: '$pidfile'...");
+
+	  my $pid= mtr_get_pid_from_file($pidfile);
+
+	  mtr_debug("Got pid: $pid from file '$pidfile'");
+
+	  if ( $::glob_cygwin_perl or kill(0, $pid) )
+	  {
+	    mtr_debug("There is process with pid $pid -- scheduling for kill.");
+	    push(@pids, $pid);            # We know (cygwin guess) it exists
+	  }
+	  else
+	  {
+	    mtr_debug("There is no process with pid $pid -- skipping.");
+	  }
+	}
+      }
+      else
+      {
+	mtr_warning("Found non pid file $elem in $rundir")
+	  if -f "$rundir/$elem";
+	next;
+      }
+    }
+    closedir(RUNDIR);
+
+    if ( @pids )
+    {
+      mtr_debug("Killing the following processes with PID files: " .
+                join(' ', @pids) . "...");
+
+      start_reap_all();
+
+      if ( $::glob_cygwin_perl )
+      {
+        # We have no (easy) way of knowing the Cygwin controlling
+        # process, in the PID file we only have the Windows process id.
+        system("kill -f " . join(" ",@pids)); # Hope for the best....
+        mtr_debug("Sleep 5 seconds waiting for processes to die");
+        sleep(5);
+      }
+      else
+      {
+        my $retries= 10;                    # 10 seconds
+        do
+        {
+          mtr_debug("Sending SIGKILL to pids: " . join(' ', @pids));
+          kill(9, @pids);
+          mtr_report("Sleep 1 second waiting for processes to die");
+          sleep(1)                      # Wait one second
+        } while ( $retries-- and  kill(0, @pids) );
+
+        if ( kill(0, @pids) )           # Check if some left
+        {
+          mtr_warning("can't kill process(es) " . join(" ", @pids));
+        }
+      }
+
+      stop_reap_all();
+    }
+  }
+  else
+  {
+    mtr_debug("Directory for PID files ($rundir) does not exist.");
+  }
+
+  # We may have failed everything, but we now check again if we have
+  # the listen ports free to use, and if they are free, just go for it.
+
+  mtr_debug("Checking known mysqld servers...");
+
+  foreach my $srv ( @kill_pids )
+  {
+    if ( defined $srv->{'port'} and mtr_ping_port($srv->{'port'}) )
+    {
+      mtr_warning("can't kill old process holding port $srv->{'port'}");
+    }
+  }
+
+  mtr_debug("mtr_kill_leftovers(): finished.");
+}
+
+
+#
+# Check that all processes in "spec" are shutdown gracefully
+# else kill them off hard
+#
+sub mtr_check_stop_servers ($) {
+  my $spec=  shift;
+
+  # Return if no processes are defined
+  return if ! @$spec;
+
+  mtr_verbose("mtr_check_stop_servers");
+
+  # ----------------------------------------------------------------------
+  # Wait until servers in "spec" has stopped listening
+  # to their ports or timeout occurs
+  # ----------------------------------------------------------------------
+  mtr_ping_with_timeout(\@$spec);
+
+  # ----------------------------------------------------------------------
+  # Use waitpid() nonblocking for a little while, to see how
+  # many process's will exit sucessfully.
+  # This is the normal case.
+  # ----------------------------------------------------------------------
+  my $wait_counter= 50; # Max number of times to redo the loop
+  foreach my $srv ( @$spec )
+  {
+    my $pid= $srv->{'pid'};
+    my $ret_pid;
+    if ( $pid )
+    {
+      $ret_pid= waitpid($pid,&WNOHANG);
+      if ($ret_pid == $pid)
+      {
+	mtr_verbose("Caught exit of process $ret_pid");
+	$srv->{'pid'}= 0;
+      }
+      elsif ($ret_pid == 0)
+      {
+	mtr_verbose("Process $pid is still alive");
+	if ($wait_counter-- > 0)
+	{
+	  # Give the processes more time to exit
+	  select(undef, undef, undef, (0.1));
+	  redo;
+	}
+      }
+      else
+      {
+	mtr_warning("caught exit of unknown child $ret_pid");
+      }
+    }
+  }
+
+  # ----------------------------------------------------------------------
+  # The processes that haven't yet exited need to
+  # be killed hard, put them in "kill_pids" hash
+  # ----------------------------------------------------------------------
+  my %kill_pids;
+  foreach my $srv ( @$spec )
+  {
+    my $pid= $srv->{'pid'};
+    if ( $pid )
+    {
+      # Server is still alive, put it in list to be hard killed
+      if ($::glob_win32_perl)
+      {
+	# Kill the real process if it's known
+	$pid= $srv->{'real_pid'} if ($srv->{'real_pid'});
+      }
+      $kill_pids{$pid}= 1;
+
+      # Write a message to the process's error log (if it has one)
+      # that it's being killed hard.
+      if ( defined $srv->{'errfile'} )
+      {
+	mtr_tofile($srv->{'errfile'}, "Note: Forcing kill of process $pid\n");
+      }
+      mtr_warning("Forcing kill of process $pid");
+
+    }
+    else
+    {
+      # Server is dead, remove the pidfile if it exists
+      #
+      # Race, could have been removed between test with -f
+      # and the unlink() below, so better check again with -f
+      if ( -f $srv->{'pidfile'} and ! unlink($srv->{'pidfile'}) and
+           -f $srv->{'pidfile'} )
+      {
+        mtr_error("can't remove $srv->{'pidfile'}");
+      }
+    }
+  }
+
+  if ( ! keys %kill_pids )
+  {
+    # All processes has exited gracefully
+    return;
+  }
+
+  mtr_kill_processes(\%kill_pids);
+
+  # ----------------------------------------------------------------------
+  # All processes are killed, cleanup leftover files
+  # ----------------------------------------------------------------------
+  {
+    my $errors= 0;
+    foreach my $srv ( @$spec )
+    {
+      if ( $srv->{'pid'} )
+      {
+	# Server has been hard killed, clean it's resources
+	foreach my $file ($srv->{'pidfile'}, $srv->{'sockfile'})
+        {
+	  # Know it is dead so should be no race, careful anyway
+	  if ( defined $file and -f $file and ! unlink($file) and -f $file )
+          {
+	    $errors++;
+	    mtr_warning("couldn't delete $file");
+	  }
+	}
+
+	if ($::glob_win32_perl and $srv->{'real_pid'})
+	{
+	  # Wait for the pseudo pid - if the real_pid was known
+	  # the pseudo pid has not been waited for yet, wai blocking
+	  # since it's "such a simple program"
+	  mtr_verbose("Wait for pseudo process $srv->{'pid'}");
+	  my $ret_pid= waitpid($srv->{'pid'}, 0);
+	  mtr_verbose("Pseudo process $ret_pid died");
+	}
+
+	$srv->{'pid'}= 0;
+      }
+    }
+    if ( $errors )
+    {
+      # There where errors killing processes
+      # do one last attempt to ping the servers
+      # and if they can't be pinged, assume they are dead
+      if ( ! mtr_ping_with_timeout( \@$spec ) )
+      {
+	mtr_error("we could not kill or clean up all processes");
+      }
+      else
+      {
+	mtr_verbose("All ports were free, continuing");
+      }
+    }
+  }
+}
+
+
+# Wait for all the process in the list to terminate
+sub mtr_wait_blocking($) {
+  my $admin_pids= shift;
+
+
+  # Return if no processes defined
+  return if ! %$admin_pids;
+
+  mtr_verbose("mtr_wait_blocking");
+
+  # Wait for all the started processes to exit
+  # As mysqladmin is such a simple program, we trust it to terminate itself.
+  # I.e. we wait blocking, and wait for them all before we go on.
+  foreach my $pid (keys %{$admin_pids})
+  {
+    my $ret_pid= waitpid($pid,0);
+
+  }
+}
+
+# Start "mysqladmin <command>" for a specific mysqld
+sub mtr_mysqladmin_start($$$) {
+  my $srv= shift;
+  my $command= shift;
+  my $adm_shutdown_tmo= shift;
+
+  my $args;
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--user=%s", $::opt_user);
+  mtr_add_arg($args, "--password=");
+  mtr_add_arg($args, "--silent");
+  if ( -e $srv->{'path_sock'} )
+  {
+    mtr_add_arg($args, "--socket=%s", $srv->{'path_sock'});
+  }
+  if ( $srv->{'port'} )
+  {
+    mtr_add_arg($args, "--port=%s", $srv->{'port'});
+  }
+  if ( $srv->{'port'} and ! -e $srv->{'path_sock'} )
+  {
+    mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket
+  }
+  mtr_add_arg($args, "--connect_timeout=5");
+
+  # Shutdown time must be high as slave may be in reconnect
+  mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");
+  mtr_add_arg($args, "$command");
+  my $pid= mtr_spawn($::exe_mysqladmin, $args,
+		     "", "", "", "",
+		     { append_log_file => 1 });
+  mtr_verbose("mtr_mysqladmin_start, pid: $pid");
+  return $pid;
+
+}
+
+# Start "ndb_mgm shutdown" for a specific cluster, it will
+# shutdown all data nodes and leave the ndb_mgmd running
+sub mtr_ndbmgm_start($$) {
+  my $cluster= shift;
+  my $command= shift;
+
+  my $args;
+
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--core");
+  mtr_add_arg($args, "--try-reconnect=1");
+  mtr_add_arg($args, "--ndb_connectstring=%s", $cluster->{'connect_string'});
+  mtr_add_arg($args, "-e");
+  mtr_add_arg($args, "$command");
+
+  my $pid= mtr_spawn($::exe_ndb_mgm, $args,
+		     "", "/dev/null", "/dev/null", "",
+		     {});
+  mtr_verbose("mtr_ndbmgm_start, pid: $pid");
+  return $pid;
+
+}
+
+
+# Ping all servers in list, exit when none of them answers
+# or when timeout has passed
+sub mtr_ping_with_timeout($) {
+  my $spec= shift;
+  my $timeout= 200;                     # 20 seconds max
+  my $res= 1;                           # If we just fall through, we are done
+                                        # in the sense that the servers don't
+                                        # listen to their ports any longer
+
+  mtr_debug("Waiting for mysqld servers to stop...");
+
+ TIME:
+  while ( $timeout-- )
+  {
+    foreach my $srv ( @$spec )
+    {
+      $res= 1;                          # We are optimistic
+      if ( $srv->{'pid'} and defined $srv->{'port'} )
+      {
+	if ( mtr_ping_port($srv->{'port'}) )
+	{
+	  mtr_verbose("waiting for process $srv->{'pid'} to stop ".
+		      "using port $srv->{'port'}");
+
+	  # Millisceond sleep emulated with select
+	  select(undef, undef, undef, (0.1));
+	  $res= 0;
+	  next TIME;
+	}
+	else
+	{
+	  # Process was not using port
+	}
+      }
+    }
+    last;                               # If we got here, we are done
+  }
+
+  if ($res)
+  {
+    mtr_debug("mtr_ping_with_timeout(): All mysqld instances are down.");
+  }
+  else
+  {
+    mtr_report("mtr_ping_with_timeout(): At least one server is alive.");
+  }
+
+  return $res;
+}
+
+
+#
+# Loop through our list of processes and look for and entry
+# with the provided pid
+# Set the pid of that process to 0 if found
+#
+sub mark_process_dead($)
+{
+  my $ret_pid= shift;
+
+  foreach my $mysqld (@{$::master}, @{$::slave})
+  {
+    if ( $mysqld->{'pid'} eq $ret_pid )
+    {
+      mtr_verbose("$mysqld->{'type'} $mysqld->{'idx'} exited, pid: $ret_pid");
+      $mysqld->{'pid'}= 0;
+      return;
+    }
+  }
+
+  foreach my $cluster (@{$::clusters})
+  {
+    if ( $cluster->{'pid'} eq $ret_pid )
+    {
+      mtr_verbose("$cluster->{'name'} cluster ndb_mgmd exited, pid: $ret_pid");
+      $cluster->{'pid'}= 0;
+      return;
+    }
+
+    foreach my $ndbd (@{$cluster->{'ndbds'}})
+    {
+      if ( $ndbd->{'pid'} eq $ret_pid )
+      {
+	mtr_verbose("$cluster->{'name'} cluster ndbd exited, pid: $ret_pid");
+	$ndbd->{'pid'}= 0;
+	return;
+      }
+    }
+  }
+  mtr_warning("mark_process_dead couldn't find an entry for pid: $ret_pid");
+
+}
+
+#
+# Loop through our list of processes and look for and entry
+# with the provided pid, if found check for the file indicating
+# expected crash and restart it.
+#
+sub check_expected_crash_and_restart($)
+{
+  my $ret_pid= shift;
+
+  foreach my $mysqld (@{$::master}, @{$::slave})
+  {
+    if ( $mysqld->{'pid'} eq $ret_pid )
+    {
+      mtr_verbose("$mysqld->{'type'} $mysqld->{'idx'} exited, pid: $ret_pid");
+      $mysqld->{'pid'}= 0;
+
+      # Check if crash expected and restart if it was
+      my $expect_file= "$::opt_vardir/tmp/" . "$mysqld->{'type'}" .
+	"$mysqld->{'idx'}" . ".expect";
+      if ( -f $expect_file )
+      {
+	mtr_verbose("Crash was expected, file $expect_file exists");
+	mysqld_start($mysqld, $mysqld->{'start_opts'},
+		     $mysqld->{'start_slave_master_info'});
+	unlink($expect_file);
+      }
+
+      return;
+    }
+  }
+
+  foreach my $cluster (@{$::clusters})
+  {
+    if ( $cluster->{'pid'} eq $ret_pid )
+    {
+      mtr_verbose("$cluster->{'name'} cluster ndb_mgmd exited, pid: $ret_pid");
+      $cluster->{'pid'}= 0;
+
+      # Check if crash expected and restart if it was
+      my $expect_file= "$::opt_vardir/tmp/ndb_mgmd_" . "$cluster->{'type'}" .
+	".expect";
+      if ( -f $expect_file )
+      {
+	mtr_verbose("Crash was expected, file $expect_file exists");
+	ndbmgmd_start($cluster);
+	unlink($expect_file);
+      }
+      return;
+    }
+
+    foreach my $ndbd (@{$cluster->{'ndbds'}})
+    {
+      if ( $ndbd->{'pid'} eq $ret_pid )
+      {
+	mtr_verbose("$cluster->{'name'} cluster ndbd exited, pid: $ret_pid");
+	$ndbd->{'pid'}= 0;
+
+	# Check if crash expected and restart if it was
+	my $expect_file= "$::opt_vardir/tmp/ndbd_" . "$cluster->{'type'}" .
+	  "$ndbd->{'idx'}" . ".expect";
+	if ( -f $expect_file )
+	{
+	  mtr_verbose("Crash was expected, file $expect_file exists");
+	  ndbd_start($cluster, $ndbd->{'idx'},
+		     $ndbd->{'start_extra_args'});
+	  unlink($expect_file);
+	}
+	return;
+      }
+    }
+  }
+
+  if ($::instance_manager->{'spawner_pid'} eq $ret_pid)
+  {
+    return;
+  }
+
+  mtr_warning("check_expected_crash_and_restart couldn't find an entry for pid: $ret_pid");
+
+}
+
+##############################################################################
+#
+#  The operating system will keep information about dead children, 
+#  we read this information here, and if we have records the process
+#  is alive, we mark it as dead.
+#
+##############################################################################
+
+sub mtr_record_dead_children () {
+
+  my $process_died= 0;
+  my $ret_pid;
+
+  # Wait without blockinng to see if any processes had died
+  # -1 or 0 means there are no more procesess to wait for
+  while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1)
+  {
+    mtr_warning("mtr_record_dead_children: $ret_pid");
+    mark_process_dead($ret_pid);
+    $process_died= 1;
+  }
+  return $process_died;
+}
+
+sub start_reap_all {
+  # This causes terminating processes to not become zombies, avoiding
+  # the need for (or possibility of) explicit waitpid().
+  $SIG{CHLD}= 'IGNORE';
+
+  # On some platforms (Linux, QNX, OSX, ...) there is potential race
+  # here. If a process terminated before setting $SIG{CHLD} (but after
+  # any attempt to waitpid() it), it will still be a zombie. So we
+  # have to handle any such process here.
+  my $pid;
+  while(($pid= waitpid(-1, &WNOHANG)) != 0 and $pid != -1)
+  {
+    mtr_warning("start_reap_all pid: $pid");
+    mark_process_dead($pid);
+  };
+}
+
+sub stop_reap_all {
+  $SIG{CHLD}= 'DEFAULT';
+}
+
+
+sub mtr_ping_port ($) {
+  my $port= shift;
+
+  mtr_verbose("mtr_ping_port: $port");
+
+  my $remote= "localhost";
+  my $iaddr=  inet_aton($remote);
+  if ( ! $iaddr )
+  {
+    mtr_error("can't find IP number for $remote");
+  }
+  my $paddr=  sockaddr_in($port, $iaddr);
+  my $proto=  getprotobyname('tcp');
+  if ( ! socket(SOCK, PF_INET, SOCK_STREAM, $proto) )
+  {
+    mtr_error("can't create socket: $!");
+  }
+
+  mtr_debug("Pinging server (port: $port)...");
+
+  if ( connect(SOCK, $paddr) )
+  {
+    close(SOCK);                        # FIXME check error?
+    mtr_verbose("USED");
+    return 1;
+  }
+  else
+  {
+    mtr_verbose("FREE");
+    return 0;
+  }
+}
+
+##############################################################################
+#
+#  Wait for a file to be created
+#
+##############################################################################
+
+# FIXME check that the pidfile contains the expected pid!
+
+sub sleep_until_file_created ($$$) {
+  my $pidfile= shift;
+  my $timeout= shift;
+  my $pid=     shift;
+  my $sleeptime= 100; # Milliseconds
+  my $loops= ($timeout * 1000) / $sleeptime;
+
+  for ( my $loop= 1; $loop <= $loops; $loop++ )
+  {
+    if ( -r $pidfile )
+    {
+      return 1;
+    }
+
+    # Check if it died after the fork() was successful
+    if ( $pid != 0 && waitpid($pid,&WNOHANG) == $pid )
+    {
+      mtr_warning("Process $pid died");
+      return 0;
+    }
+
+    mtr_debug("Sleep $sleeptime milliseconds waiting for $pidfile");
+
+    # Print extra message every 60 seconds
+    my $seconds= ($loop * $sleeptime) / 1000;
+    if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )
+    {
+      my $left= $timeout - $seconds;
+      mtr_warning("Waited $seconds seconds for $pidfile to be created, " .
+                  "still waiting for $left seconds...");
+    }
+
+    # Millisceond sleep emulated with select
+    select(undef, undef, undef, ($sleeptime/1000));
+  }
+
+  return 0;
+}
+
+
+sub mtr_kill_processes ($) {
+  my $pids = shift;
+
+  mtr_verbose("mtr_kill_processes (" . join(" ", keys %{$pids}) . ")");
+
+  foreach my $pid (keys %{$pids})
+  {
+
+    if ($pid <= 0)
+    {
+      mtr_warning("Trying to kill illegal pid: $pid");
+      next;
+    }
+
+    my $signaled_procs= kill(9, $pid);
+    if ($signaled_procs == 0)
+    {
+      # No such process existed, assume it's killed
+      mtr_verbose("killed $pid(no such process)");
+    }
+    else
+    {
+      my $ret_pid= waitpid($pid,0);
+      if ($ret_pid == $pid)
+      {
+	mtr_verbose("killed $pid(got the pid)");
+      }
+      elsif ($ret_pid == -1)
+      {
+	mtr_verbose("killed $pid(got -1)");
+      }
+    }
+  }
+  mtr_verbose("done killing processes");
+}
+
+
+##############################################################################
+#
+#  When we exit, we kill off all children
+#
+##############################################################################
+
+sub mtr_exit ($) {
+  my $code= shift;
+  mtr_timer_stop_all($::glob_timers);
+  local $SIG{HUP} = 'IGNORE';
+  # ToDo: Signalling -$$ will only work if we are the process group
+  # leader (in fact on QNX it will signal our session group leader,
+  # which might be Do-compile or Pushbuild, causing tests to be
+  # aborted). So we only do it if we are the group leader. We might
+  # set ourselves as the group leader at startup (with
+  # POSIX::setpgrp(0,0)), but then care must be needed to always do
+  # proper child process cleanup.
+  POSIX::kill(SIGHUP, -$$) if !$::glob_win32_perl and $$ == getpgrp();
+
+  exit($code);
+}
+
+###########################################################################
+
+1;
diff --git a/mysql-test/lib/v1/mtr_report.pl b/mysql-test/lib/v1/mtr_report.pl
new file mode 100644
index 00000000000..3c78c3ca064
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_report.pl
@@ -0,0 +1,598 @@
+# -*- cperl -*-
+# Copyright (C) 2004-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+use warnings;
+
+sub mtr_report_test_name($);
+sub mtr_report_test_passed($);
+sub mtr_report_test_failed($);
+sub mtr_report_test_skipped($);
+sub mtr_report_test_not_skipped_though_disabled($);
+
+sub mtr_report_stats ($);
+sub mtr_print_line ();
+sub mtr_print_thick_line ();
+sub mtr_print_header ();
+sub mtr_report (@);
+sub mtr_warning (@);
+sub mtr_error (@);
+sub mtr_child_error (@);
+sub mtr_debug (@);
+sub mtr_verbose (@);
+
+my $tot_real_time= 0;
+
+
+
+##############################################################################
+#
+#  
+#
+##############################################################################
+
+sub mtr_report_test_name ($) {
+  my $tinfo= shift;
+  my $tname= $tinfo->{name};
+
+  $tname.= " '$tinfo->{combination}'"
+    if defined $tinfo->{combination};
+
+  _mtr_log($tname);
+  printf "%-30s ", $tname;
+}
+
+sub mtr_report_test_skipped ($) {
+  my $tinfo= shift;
+
+  $tinfo->{'result'}= 'MTR_RES_SKIPPED';
+  if ( $tinfo->{'disable'} )
+  {
+    mtr_report("[ disabled ]  $tinfo->{'comment'}");
+  }
+  elsif ( $tinfo->{'comment'} )
+  {
+    mtr_report("[ skipped ]   $tinfo->{'comment'}");
+  }
+  else
+  {
+    mtr_report("[ skipped ]");
+  }
+}
+
+sub mtr_report_tests_not_skipped_though_disabled ($) {
+  my $tests= shift;
+
+  if ( $::opt_enable_disabled )
+  {
+    my @disabled_tests= grep {$_->{'dont_skip_though_disabled'}} @$tests;
+    if ( @disabled_tests )
+    {
+      print "\nTest(s) which will be run though they are marked as disabled:\n";
+      foreach my $tinfo ( sort {$a->{'name'} cmp $b->{'name'}} @disabled_tests )
+      {
+        printf "  %-20s : %s\n", $tinfo->{'name'}, $tinfo->{'comment'};
+      }
+    }
+  }
+}
+
+sub mtr_report_test_passed ($) {
+  my $tinfo= shift;
+
+  my $timer=  "";
+  if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
+  {
+    $timer= mtr_fromfile("$::opt_vardir/log/timer");
+    $tot_real_time += ($timer/1000);
+    $timer= sprintf "%12s", $timer;
+  }
+  $tinfo->{'result'}= 'MTR_RES_PASSED';
+  mtr_report("[ pass ]   $timer");
+}
+
+sub mtr_report_test_failed ($) {
+  my $tinfo= shift;
+
+  $tinfo->{'result'}= 'MTR_RES_FAILED';
+  if ( defined $tinfo->{'timeout'} )
+  {
+    mtr_report("[ fail ]  timeout");
+    return;
+  }
+  else
+  {
+    mtr_report("[ fail ]");
+  }
+
+  if ( $tinfo->{'comment'} )
+  {
+    # The test failure has been detected by mysql-test-run.pl
+    # when starting the servers or due to other error, the reason for
+    # failing the test is saved in "comment"
+    mtr_report("\nERROR: $tinfo->{'comment'}");
+  }
+  elsif ( -f $::path_timefile )
+  {
+    # Test failure was detected by test tool and it's report
+    # about what failed has been saved to file. Display the report.
+    print "\n";
+    print mtr_fromfile($::path_timefile); # FIXME print_file() instead
+    print "\n";
+  }
+  else
+  {
+    # Neither this script or the test tool has recorded info
+    # about why the test has failed. Should be debugged.
+    mtr_report("\nUnexpected termination, probably when starting mysqld");;
+  }
+}
+
+sub mtr_report_stats ($) {
+  my $tests= shift;
+
+  # ----------------------------------------------------------------------
+  # Find out how we where doing
+  # ----------------------------------------------------------------------
+
+  my $tot_skiped= 0;
+  my $tot_passed= 0;
+  my $tot_failed= 0;
+  my $tot_tests=  0;
+  my $tot_restarts= 0;
+  my $found_problems= 0; # Some warnings in the logfiles are errors...
+
+  foreach my $tinfo (@$tests)
+  {
+    if ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' )
+    {
+      $tot_skiped++;
+    }
+    elsif ( $tinfo->{'result'} eq 'MTR_RES_PASSED' )
+    {
+      $tot_tests++;
+      $tot_passed++;
+    }
+    elsif ( $tinfo->{'result'} eq 'MTR_RES_FAILED' )
+    {
+      $tot_tests++;
+      $tot_failed++;
+    }
+    if ( $tinfo->{'restarted'} )
+    {
+      $tot_restarts++;
+    }
+  }
+
+  # ----------------------------------------------------------------------
+  # Print out a summary report to screen
+  # ----------------------------------------------------------------------
+
+  if ( ! $tot_failed )
+  {
+    print "All $tot_tests tests were successful.\n";
+  }
+  else
+  {
+    my $ratio=  $tot_passed * 100 / $tot_tests;
+    print "Failed $tot_failed/$tot_tests tests, ";
+    printf("%.2f", $ratio);
+    print "\% were successful.\n\n";
+    print
+      "The log files in var/log may give you some hint\n",
+      "of what went wrong.\n",
+      "If you want to report this error, please read first ",
+      "the documentation at\n",
+      "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n";
+  }
+  if (!$::opt_extern)
+  {
+    print "The servers were restarted $tot_restarts times\n";
+  }
+
+  if ( $::opt_timer )
+  {
+    use English;
+
+    mtr_report("Spent", sprintf("%.3f", $tot_real_time),"of",
+	       time - $BASETIME, "seconds executing testcases");
+  }
+
+  # ----------------------------------------------------------------------
+  # If a debug run, there might be interesting information inside
+  # the "var/log/*.err" files. We save this info in "var/log/warnings"
+  # ----------------------------------------------------------------------
+
+  if ( ! $::glob_use_running_server )
+  {
+    # Save and report if there was any fatal warnings/errors in err logs
+
+    my $warnlog= "$::opt_vardir/log/warnings";
+
+    unless ( open(WARN, ">$warnlog") )
+    {
+      mtr_warning("can't write to the file \"$warnlog\": $!");
+    }
+    else
+    {
+      # We report different types of problems in order
+      foreach my $pattern ( "^Warning:",
+			    "\\[Warning\\]",
+			    "\\[ERROR\\]",
+			    "^Error:", "^==.* at 0x",
+			    "InnoDB: Warning",
+			    "InnoDB: Error",
+			    "^safe_mutex:",
+			    "missing DBUG_RETURN",
+			    "mysqld: Warning",
+			    "allocated at line",
+			    "Attempting backtrace", "Assertion .* failed" )
+      {
+        foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") )
+        {
+	  my $testname= "";
+          unless ( open(ERR, $errlog) )
+          {
+            mtr_warning("can't read $errlog");
+            next;
+          }
+          my $leak_reports_expected= undef;
+          while ( <ERR> )
+          {
+            # There is a test case that purposely provokes a
+            # SAFEMALLOC leak report, even though there is no actual
+            # leak. We need to detect this, and ignore the warning in
+            # that case.
+            if (/Begin safemalloc memory dump:/) {
+              $leak_reports_expected= 1;
+            } elsif (/End safemalloc memory dump./) {
+              $leak_reports_expected= undef;
+            }
+
+            # Skip some non fatal warnings from the log files
+            if (
+		/\"SELECT UNIX_TIMESTAMP\(\)\" failed on master/ or
+		/Aborted connection/ or
+		/Client requested master to start replication from impossible position/ or
+		/Could not find first log file name in binary log/ or
+		/Enabling keys got errno/ or
+		/Error reading master configuration/ or
+		/Error reading packet/ or
+		/Event Scheduler/ or
+		/Failed to open log/ or
+		/Failed to open the existing master info file/ or
+		/Forcing shutdown of [0-9]* plugins/ or
+                /Can't open shared library .*\bha_example\b/ or
+                /Couldn't load plugin .*\bha_example\b/ or
+
+		# Due to timing issues, it might be that this warning
+		# is printed when the server shuts down and the
+		# computer is loaded.
+		/Forcing close of thread \d+  user: '.*?'/ or
+
+		/Got error [0-9]* when reading table/ or
+		/Incorrect definition of table/ or
+		/Incorrect information in file/ or
+		/InnoDB: Warning: we did not need to do crash recovery/ or
+		/Invalid \(old\?\) table or database name/ or
+		/Lock wait timeout exceeded/ or
+		/Log entry on master is longer than max_allowed_packet/ or
+                /unknown option '--loose-/ or
+                /unknown variable 'loose-/ or
+		/You have forced lower_case_table_names to 0 through a command-line option/ or
+		/Setting lower_case_table_names=2/ or
+		/NDB Binlog:/ or
+		/NDB: failed to setup table/ or
+		/NDB: only row based binary logging/ or
+		/Neither --relay-log nor --relay-log-index were used/ or
+		/Query partially completed/ or
+		/Slave I.O thread aborted while waiting for relay log/ or
+		/Slave SQL thread is stopped because UNTIL condition/ or
+		/Slave SQL thread retried transaction/ or
+		/Slave \(additional info\)/ or
+		/Slave: .*Duplicate column name/ or
+		/Slave: .*master may suffer from/ or
+		/Slave: According to the master's version/ or
+		/Slave: Column [0-9]* type mismatch/ or
+		/Slave: Error .* doesn't exist/ or
+		/Slave: Deadlock found/ or
+		/Slave: Error .*Unknown table/ or
+		/Slave: Error in Write_rows event: / or
+		/Slave: Field .* of table .* has no default value/ or
+                /Slave: Field .* doesn't have a default value/ or
+		/Slave: Query caused different errors on master and slave/ or
+		/Slave: Table .* doesn't exist/ or
+		/Slave: Table width mismatch/ or
+		/Slave: The incident LOST_EVENTS occured on the master/ or
+		/Slave: Unknown error.* 1105/ or
+		/Slave: Can't drop database.* database doesn't exist/ or
+                /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or
+		/Sort aborted/ or
+		/Time-out in NDB/ or
+		/One can only use the --user.*root/ or
+		/Table:.* on (delete|rename)/ or
+		/You have an error in your SQL syntax/ or
+		/deprecated/ or
+		/description of time zone/ or
+		/equal MySQL server ids/ or
+		/error .*connecting to master/ or
+		/error reading log entry/ or
+		/lower_case_table_names is set/ or
+		/skip-name-resolve mode/ or
+		/slave SQL thread aborted/ or
+		/Slave: .*Duplicate entry/ or
+		# Special case for Bug #26402 in show_check.test
+		# Question marks are not valid file name parts
+		# on Windows platforms. Ignore this error message. 
+		/\QCan't find file: '.\test\????????.frm'\E/ or
+		# Special case, made as specific as possible, for:
+		# Bug #28436: Incorrect position in SHOW BINLOG EVENTS causes
+		#             server coredump
+		/\QError in Log_event::read_log_event(): 'Sanity check failed', data_len: 258, event_type: 49\E/ or
+                /Statement is not safe to log in statement format/ or
+
+                # test case for Bug#bug29807 copies a stray frm into database
+                /InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal/ or
+                /Cannot find or open table test\/bug29807 from/ or
+
+                # innodb foreign key tests that fail in ALTER or RENAME produce this
+                /InnoDB: Error: in ALTER TABLE `test`.`t[12]`/ or
+                /InnoDB: Error: in RENAME TABLE table `test`.`t1`/ or
+                /InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/ or
+
+                # Test case for Bug#14233 produces the following warnings:
+                /Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc/ or
+                /Stored routine 'test'.'bug14233_2': invalid value in column mysql.proc/ or
+                /Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc/ or
+
+                # BUG#29839 - lowercase_table3.test: Cannot find table test/T1
+                #             from the internal data dictiona
+                /Cannot find table test\/BUG29839 from the internal data dictionary/ or
+                # BUG#32080 - Excessive warnings on Solaris: setrlimit could not
+                #             change the size of core files
+                /setrlimit could not change the size of core files to 'infinity'/ or
+
+		# rpl_extrColmaster_*.test, the slave thread produces warnings
+		# when it get updates to a table that has more columns on the
+		# master
+		/Slave: Unknown column 'c7' in 't15' Error_code: 1054/ or
+		/Slave: Can't DROP 'c7'.* 1091/ or
+		/Slave: Key column 'c6'.* 1072/ or
+
+		# rpl_idempotency.test produces warnings for the slave.
+		($testname eq 'rpl.rpl_idempotency' and
+		 (/Slave: Can\'t find record in \'t1\' Error_code: 1032/ or
+                  /Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452/
+		 )) or
+
+		# These tests does "kill" on queries, causing sporadic errors when writing to logs
+		(($testname eq 'rpl.rpl_skip_error' or
+		  $testname eq 'rpl.rpl_err_ignoredtable' or
+		  $testname eq 'binlog.binlog_killed_simulate' or
+		  $testname eq 'binlog.binlog_killed') and
+		 (/Failed to write to mysql\.\w+_log/
+		 )) or
+
+		# rpl_bug33931 has deliberate failures
+		($testname eq 'rpl.rpl_bug33931' and
+		 (/Failed during slave.*thread initialization/
+		  )) or
+
+		# rpl_temporary has an error on slave that can be ignored
+		($testname eq 'rpl.rpl_temporary' and
+		 (/Slave: Can\'t find record in \'user\' Error_code: 1032/
+		 )) or
+
+                # Test case for Bug#31590 produces the following error:
+                /Out of sort memory; increase server sort buffer size/ or
+
+                # Bug#35161, test of auto repair --myisam-recover
+                /able.*_will_crash/ or
+
+                # lowercase_table3 using case sensitive option on
+                # case insensitive filesystem (InnoDB error).
+                /Cannot find or open table test\/BUG29839 from/ or
+
+                # When trying to set lower_case_table_names = 2
+                # on a case sensitive file system. Bug#37402.
+                /lower_case_table_names was set to 2, even though your the file system '.*' is case sensitive.  Now setting lower_case_table_names to 0 to avoid future problems./
+		)
+            {
+              next;                       # Skip these lines
+            }
+	    if ( /CURRENT_TEST: (.*)/ )
+	    {
+	      $testname= $1;
+	    }
+            if ( /$pattern/ )
+            {
+              if ($leak_reports_expected) {
+                next;
+              }
+              $found_problems= 1;
+              print WARN basename($errlog) . ": $testname: $_";
+            }
+          }
+        }
+      }
+
+      if ( $::opt_check_testcases )
+      {
+        # Look for warnings produced by mysqltest in testname.warnings
+        foreach my $test_warning_file
+	  ( glob("$::glob_mysql_test_dir/r/*.warnings") )
+        {
+          $found_problems= 1;
+	  print WARN "Check myqltest warnings in $test_warning_file\n";
+        }
+      }
+
+      if ( $found_problems )
+      {
+	mtr_warning("Got errors/warnings while running tests, please examine",
+		    "\"$warnlog\" for details.");
+      }
+    }
+  }
+
+  print "\n";
+
+  # Print a list of testcases that failed
+  if ( $tot_failed != 0 )
+  {
+    my $test_mode= join(" ", @::glob_test_mode) || "default";
+    print "mysql-test-run in $test_mode mode: *** Failing the test(s):";
+
+    foreach my $tinfo (@$tests)
+    {
+      if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' )
+      {
+        print " $tinfo->{'name'}";
+      }
+    }
+    print "\n";
+
+  }
+
+  # Print a list of check_testcases that failed(if any)
+  if ( $::opt_check_testcases )
+  {
+    my @check_testcases= ();
+
+    foreach my $tinfo (@$tests)
+    {
+      if ( defined $tinfo->{'check_testcase_failed'} )
+      {
+	push(@check_testcases, $tinfo->{'name'});
+      }
+    }
+
+    if ( @check_testcases )
+    {
+      print "Check of testcase failed for: ";
+      print join(" ", @check_testcases);
+      print "\n\n";
+    }
+  }
+
+  if ( $tot_failed != 0 || $found_problems)
+  {
+    mtr_error("there were failing test cases");
+  }
+}
+
+##############################################################################
+#
+#  Text formatting
+#
+##############################################################################
+
+sub mtr_print_line () {
+  print '-' x 55, "\n";
+}
+
+sub mtr_print_thick_line () {
+  print '=' x 55, "\n";
+}
+
+sub mtr_print_header () {
+  print "\n";
+  if ( $::opt_timer )
+  {
+    print "TEST                           RESULT         TIME (ms)\n";
+  }
+  else
+  {
+    print "TEST                           RESULT\n";
+  }
+  mtr_print_line();
+  print "\n";
+}
+
+
+##############################################################################
+#
+#  Log and reporting functions
+#
+##############################################################################
+
+use IO::File;
+
+my $log_file_ref= undef;
+
+sub mtr_log_init ($) {
+  my ($filename)= @_;
+
+  mtr_error("Log is already open") if defined $log_file_ref;
+
+  $log_file_ref= IO::File->new($filename, "a") or
+    mtr_warning("Could not create logfile $filename: $!");
+}
+
+sub _mtr_log (@) {
+  print $log_file_ref join(" ", @_),"\n"
+    if defined $log_file_ref;
+}
+
+sub mtr_report (@) {
+  # Print message to screen and log
+  _mtr_log(@_);
+  print join(" ", @_),"\n";
+}
+
+sub mtr_warning (@) {
+  # Print message to screen and log
+  _mtr_log("WARNING: ", @_);
+  print STDERR "mysql-test-run: WARNING: ",join(" ", @_),"\n";
+}
+
+sub mtr_error (@) {
+  # Print message to screen and log
+  _mtr_log("ERROR: ", @_);
+  print STDERR "mysql-test-run: *** ERROR: ",join(" ", @_),"\n";
+  mtr_exit(1);
+}
+
+sub mtr_child_error (@) {
+  # Print message to screen and log
+  _mtr_log("ERROR(child): ", @_);
+  print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n";
+  exit(1);
+}
+
+sub mtr_debug (@) {
+  # Only print if --script-debug is used
+  if ( $::opt_script_debug )
+  {
+    _mtr_log("###: ", @_);
+    print STDERR "####: ",join(" ", @_),"\n";
+  }
+}
+
+sub mtr_verbose (@) {
+  # Always print to log, print to screen only when --verbose is used
+  _mtr_log("> ",@_);
+  if ( $::opt_verbose )
+  {
+    print STDERR "> ",join(" ", @_),"\n";
+  }
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_stress.pl b/mysql-test/lib/v1/mtr_stress.pl
new file mode 100644
index 00000000000..93b06b32c5f
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_stress.pl
@@ -0,0 +1,191 @@
+# -*- cperl -*-
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use strict;
+use File::Spec;
+
+# These are not to be prefixed with "mtr_"
+
+sub run_stress_test ();
+
+##############################################################################
+#
+#  Run tests in the stress mode
+#
+##############################################################################
+
+sub run_stress_test () 
+{
+
+  my $args;
+  my $stress_suitedir;
+
+  mtr_report("Starting stress testing\n");
+
+  if ( ! $::glob_use_embedded_server )
+  {
+    if ( ! mysqld_start($::master->[0],[],[]) )
+    {
+      mtr_error("Can't start the mysqld server");
+    }
+  }
+
+  my $stress_basedir=File::Spec->catdir($::opt_vardir, "stress");
+  
+  #Clean up stress dir 
+  if ( -d $stress_basedir )
+  {
+    rmtree($stress_basedir);
+  }
+  mkpath($stress_basedir);
+ 
+  if ($::opt_stress_suite ne 'main' && $::opt_stress_suite ne 'default' )
+  {
+    $stress_suitedir=File::Spec->catdir($::glob_mysql_test_dir, "suite", 
+                                         $::opt_stress_suite);
+  }
+  else
+  {
+    $stress_suitedir=$::glob_mysql_test_dir;
+  }
+
+  if ( -d $stress_suitedir )
+  {
+    #$stress_suite_t_dir=File::Spec->catdir($stress_suitedir, "t");
+    #$stress_suite_r_dir=File::Spec->catdir($stress_suitedir, "r");    
+    #FIXME: check dirs above for existence to ensure that test suite 
+    #       contains tests and results dirs
+  }
+  else
+  {
+    mtr_error("Specified test suite $::opt_stress_suite doesn't exist");
+  }
+ 
+  if ( @::opt_cases )
+  {
+    $::opt_stress_test_file=File::Spec->catfile($stress_basedir, "stress_tests.txt");
+    open(STRESS_FILE, ">$::opt_stress_test_file");
+    print STRESS_FILE join("\n",@::opt_cases),"\n";
+    close(STRESS_FILE);
+  }
+  elsif ( $::opt_stress_test_file )
+  {
+    $::opt_stress_test_file=File::Spec->catfile($stress_suitedir, 
+                                              $::opt_stress_test_file);
+    if ( ! -f $::opt_stress_test_file )
+    {
+      mtr_error("Specified file $::opt_stress_test_file with list of tests does not exist\n",
+                "Please ensure that file exists and has proper permissions");
+    }
+  }
+  else
+  {
+    $::opt_stress_test_file=File::Spec->catfile($stress_suitedir, 
+                                              "stress_tests.txt");
+    if ( ! -f $::opt_stress_test_file )
+    {
+      mtr_error("Default file $::opt_stress_test_file with list of tests does not exist\n",
+          "Please use --stress-test-file option to specify custom one or you can\n",
+          "just specify name of test for testing as last argument in command line");
+
+    }    
+  }
+
+  if ( $::opt_stress_init_file )
+  {
+    $::opt_stress_init_file=File::Spec->catfile($stress_suitedir, 
+                                              $::opt_stress_init_file);
+    if ( ! -f $::opt_stress_init_file )
+    {
+      mtr_error("Specified file $::opt_stress_init_file with list of tests does not exist\n",
+                "Please ensure that file exists and has proper permissions");
+    }
+  }
+  else
+  {
+    $::opt_stress_init_file=File::Spec->catfile($stress_suitedir, 
+                                              "stress_init.txt");
+    if ( ! -f $::opt_stress_init_file )
+    {
+      $::opt_stress_init_file='';
+    }
+  }  
+  
+  if ( $::opt_stress_mode ne 'random' && $::opt_stress_mode ne 'seq' )
+  {
+    mtr_error("You specified wrong mode $::opt_stress_mode for stress test\n",
+              "Correct values are 'random' or 'seq'");
+  }
+
+  mtr_init_args(\$args);
+  
+  mtr_add_arg($args, "--server-socket=%s", $::master->[0]->{'path_sock'});
+  mtr_add_arg($args, "--server-user=%s", $::opt_user);
+  mtr_add_arg($args, "--server-database=%s", "test");  
+  mtr_add_arg($args, "--stress-suite-basedir=%s", $::glob_mysql_test_dir);  
+  mtr_add_arg($args, "--suite=%s", $::opt_stress_suite);
+  mtr_add_arg($args, "--stress-tests-file=%s", $::opt_stress_test_file);      
+  mtr_add_arg($args, "--stress-basedir=%s", $stress_basedir);
+  mtr_add_arg($args, "--server-logs-dir=%s", $stress_basedir);
+  mtr_add_arg($args, "--stress-mode=%s", $::opt_stress_mode);
+  mtr_add_arg($args, "--mysqltest=%s", $::exe_mysqltest);
+  mtr_add_arg($args, "--threads=%s", $::opt_stress_threads);
+  mtr_add_arg($args, "--verbose");
+  mtr_add_arg($args, "--cleanup");
+  mtr_add_arg($args, "--log-error-details");
+  mtr_add_arg($args, "--abort-on-error");
+
+  if ( $::opt_stress_init_file )
+  {
+    mtr_add_arg($args, "--stress-init-file=%s", $::opt_stress_init_file);
+  }
+
+  if ( !$::opt_stress_loop_count && !$::opt_stress_test_count &&
+       !$::opt_stress_test_duration )
+  {
+    #Limit stress testing with 20 loops in case when any limit parameter 
+    #was specified 
+    $::opt_stress_test_count=20;
+  }
+
+  if ( $::opt_stress_loop_count )
+  {
+    mtr_add_arg($args, "--loop-count=%s", $::opt_stress_loop_count);
+  }
+
+  if ( $::opt_stress_test_count )
+  {
+    mtr_add_arg($args, "--test-count=%s", $::opt_stress_test_count);
+  }
+
+  if ( $::opt_stress_test_duration )
+  {
+    mtr_add_arg($args, "--test-duration=%s", $::opt_stress_test_duration);
+  }
+
+  #Run stress test
+  mtr_run("$::glob_mysql_test_dir/mysql-stress-test.pl", $args, "", "", "", "");
+  if ( ! $::glob_use_embedded_server )
+  {
+    stop_all_servers();
+  }
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_timer.pl b/mysql-test/lib/v1/mtr_timer.pl
new file mode 100644
index 00000000000..326fbea74ec
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_timer.pl
@@ -0,0 +1,158 @@
+# -*- cperl -*-
+# Copyright (C) 2005-2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# This is a library file used by the Perl version of mysql-test-run,
+# and is part of the translation of the Bourne shell script with the
+# same name.
+
+use Errno;
+use strict;
+
+sub mtr_init_timers ();
+sub mtr_timer_start($$$);
+sub mtr_timer_stop($$);
+sub mtr_timer_stop_all($);
+
+
+##############################################################################
+#
+#  Initiate the structure shared by all timers
+#
+##############################################################################
+
+sub mtr_init_timers () {
+  my $timers = { timers => {}, pids => {}};
+  return $timers;
+}
+
+
+##############################################################################
+#
+#  Start, stop and poll a timer
+#
+#  As alarm() isn't portable to Windows, we use separate processes to
+#  implement timers.
+#
+##############################################################################
+
+sub mtr_timer_start($$$) {
+  my ($timers,$name,$duration)= @_;
+
+  if ( exists $timers->{'timers'}->{$name} )
+  {
+    # We have an old running timer, kill it
+    mtr_warning("There is an old timer running");
+    mtr_timer_stop($timers,$name);
+  }
+
+ FORK:
+  {
+    my $tpid= fork();
+
+    if ( ! defined $tpid )
+    {
+      if ( $! == $!{EAGAIN} )           # See "perldoc Errno"
+      {
+        mtr_warning("Got EAGAIN from fork(), sleep 1 second and redo");
+        sleep(1);
+        redo FORK;
+      }
+      else
+      {
+        mtr_error("can't fork timer, error: $!");
+      }
+    }
+
+    if ( $tpid )
+    {
+      # Parent, record the information
+      mtr_verbose("Starting timer for '$name',",
+		  "duration: $duration, pid: $tpid");
+      $timers->{'timers'}->{$name}->{'pid'}= $tpid;
+      $timers->{'timers'}->{$name}->{'duration'}= $duration;
+      $timers->{'pids'}->{$tpid}= $name;
+    }
+    else
+    {
+      # Child, install signal handlers and sleep for "duration"
+
+      # Don't do the ^C cleanup in the timeout child processes!
+      # There is actually a race here, if we get ^C after fork(), but before
+      # clearing the signal handler.
+      $SIG{INT}= 'DEFAULT';
+
+      $SIG{TERM}= sub {
+	mtr_verbose("timer $$ woke up, exiting!");
+	exit(0);
+      };
+
+      $0= "mtr_timer(timers,$name,$duration)";
+      sleep($duration);
+      mtr_verbose("timer $$ expired after $duration seconds");
+      exit(0);
+    }
+  }
+}
+
+
+sub mtr_timer_stop ($$) {
+  my ($timers,$name)= @_;
+
+  if ( exists $timers->{'timers'}->{$name} )
+  {
+    my $tpid= $timers->{'timers'}->{$name}->{'pid'};
+    mtr_verbose("Stopping timer for '$name' with pid $tpid");
+
+    # FIXME as Cygwin reuses pids fast, maybe check that is
+    # the expected process somehow?!
+    kill(15, $tpid);
+
+    # As the timers are so simple programs, we trust them to terminate,
+    # and use blocking wait for it. We wait just to avoid a zombie.
+    waitpid($tpid,0);
+
+    delete $timers->{'timers'}->{$name}; # Remove the timer information
+    delete $timers->{'pids'}->{$tpid};   # and PID reference
+
+    return 1;
+  }
+
+  mtr_error("Asked to stop timer '$name' not started");
+}
+
+
+sub mtr_timer_stop_all ($) {
+  my $timers= shift;
+
+  foreach my $name ( keys %{$timers->{'timers'}} )
+  {
+    mtr_timer_stop($timers, $name);
+  }
+  return 1;
+}
+
+
+sub mtr_timer_timeout ($$) {
+  my ($timers,$pid)= @_;
+
+  return "" unless exists $timers->{'pids'}->{$pid};
+
+  # Got a timeout(the process with $pid is recorded as being a timer)
+  # return the name of the timer
+  return $timers->{'pids'}->{$pid};
+}
+
+1;
diff --git a/mysql-test/lib/v1/mtr_unique.pl b/mysql-test/lib/v1/mtr_unique.pl
new file mode 100644
index 00000000000..a668fc097c7
--- /dev/null
+++ b/mysql-test/lib/v1/mtr_unique.pl
@@ -0,0 +1,178 @@
+# -*- cperl -*-
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#
+# This file is used from mysql-test-run.pl when choosing
+# port numbers and directories to use for running mysqld.
+#
+
+use strict;
+use Fcntl ':flock';
+
+#
+# Requested IDs are stored in a hash and released upon END.
+#
+my %mtr_unique_assigned_ids = ();
+my $mtr_unique_pid;
+BEGIN {
+	$mtr_unique_pid = $$ unless defined $mtr_unique_pid;
+}
+END { 
+	if($mtr_unique_pid == $$) {
+		while(my ($id,$file) = each(%mtr_unique_assigned_ids)) {
+			print "Autoreleasing $file:$id\n";
+			mtr_release_unique_id($file, $id);
+		}
+	}
+}
+
+#
+# Require a unique, numerical ID, given a file name (where all
+# requested IDs are stored), a minimum and a maximum value.
+#
+# We use flock to implement locking for the ID file and ignore
+# possible problems arising from lack of support for it on 
+# some platforms (it should work on most, and the possible
+# race condition would occur rarely). The proper solution for
+# this is a daemon that manages IDs, of course.
+#
+# If no unique ID within the specified parameters can be 
+# obtained, return undef.
+#
+sub mtr_require_unique_id($$$) {
+	my $file = shift;
+	my $min = shift;
+	my $max = shift;
+	my $ret = undef;
+	my $changed = 0;
+
+	my $can_use_ps = `ps -e | grep '^[ ]*$$ '`;
+
+	if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
+		die 'lock file is a symbolic link';
+	}
+
+	chmod 0777, "$file.sem";
+	open SEM, ">", "$file.sem" or die "can't write to $file.sem";
+	flock SEM, LOCK_EX or die "can't lock $file.sem";
+	if(! -e $file) {
+		open FILE, ">", $file or die "can't create $file";
+		close FILE;
+	}
+
+	if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
+		die 'lock file is a symbolic link';
+	}
+
+	chmod 0777, $file;
+	open FILE, "+<", $file or die "can't open $file";
+	select undef,undef,undef,0.2;
+	seek FILE, 0, 0;
+	my %taken = ();
+	while(<FILE>) {
+		chomp;
+		my ($id, $pid) = split / /;
+		$taken{$id} = $pid;
+		if($can_use_ps) {
+			my $res = `ps -e | grep '^[ ]*$pid '`;
+			if(!$res) {
+				print "Ignoring slot $id used by missing process $pid.\n";
+				delete $taken{$id};
+				++$changed;
+			}
+		}
+	}
+	for(my $i=$min; $i<=$max; ++$i) {
+		if(! exists $taken{$i}) {
+			$ret = $i;
+			$taken{$i} = $$;
+			++$changed;
+			last;
+		}
+	}
+	if($changed) {
+		seek FILE, 0, 0;
+		truncate FILE, 0 or die "can't truncate $file";
+		for my $k (keys %taken) {
+			print FILE $k . ' ' . $taken{$k} . "\n";
+		}
+	}
+	close FILE;
+	flock SEM, LOCK_UN or warn "can't unlock $file.sem";
+	close SEM;
+	$mtr_unique_assigned_ids{$ret} = $file if defined $ret;
+	return $ret;
+}
+
+#
+# Require a unique ID like above, but sleep if no ID can be
+# obtained immediately.
+#
+sub mtr_require_unique_id_and_wait($$$) {
+	my $ret = mtr_require_unique_id($_[0],$_[1],$_[2]);
+	while(! defined $ret) {
+		sleep 30;
+		$ret = mtr_require_unique_id($_[0],$_[1],$_[2]);
+		print "Waiting for unique id to become available...\n" unless $ret;
+	}
+	return $ret;
+}
+
+#
+# Release a unique ID.
+#
+sub mtr_release_unique_id($$) {
+	my $file = shift;
+	my $myid = shift;
+
+	if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
+		die 'lock file is a symbolic link';
+	}
+
+	open SEM, ">", "$file.sem" or die "can't write to $file.sem";
+	flock SEM, LOCK_EX or die "can't lock $file.sem";
+
+	if(eval("readlink '$file'") || eval("readlink '$file.sem'")) {
+		die 'lock file is a symbolic link';
+	}
+
+	if(! -e $file) {
+		open FILE, ">", $file or die "can't create $file";
+		close FILE;
+	}
+	open FILE, "+<", $file or die "can't open $file";
+	select undef,undef,undef,0.2;
+	seek FILE, 0, 0;
+	my %taken = ();
+	while(<FILE>) {
+		chomp;
+		my ($id, $pid) = split / /;
+		$taken{$id} = $pid;
+	}
+	delete $taken{$myid};
+	seek FILE, 0, 0;
+	truncate FILE, 0 or die "can't truncate $file";
+	for my $k (keys %taken) {
+		print FILE $k . ' ' . $taken{$k} . "\n";
+	}
+	close FILE;
+	flock SEM, LOCK_UN or warn "can't unlock $file.sem";
+	close SEM;
+	delete $mtr_unique_assigned_ids{$myid};
+}
+
+1;
+
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
new file mode 100755
index 00000000000..86ad5c485c1
--- /dev/null
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -0,0 +1,5393 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+
+#
+##############################################################################
+#
+#  mysql-test-run.pl
+#
+#  Tool used for executing a suite of .test file
+#
+#  See the "MySQL Test framework manual" for more information
+#  http://dev.mysql.com/doc/mysqltest/en/index.html
+#
+#  Please keep the test framework tools identical in all versions!
+#
+##############################################################################
+#
+# Coding style directions for this perl script
+#
+#   - To make this Perl script easy to alter even for those that not
+#     code Perl that often, keeep the coding style as close as possible to
+#     the C/C++ MySQL coding standard.
+#
+#   - All lists of arguments to send to commands are Perl lists/arrays,
+#     not strings we append args to. Within reason, most string
+#     concatenation for arguments should be avoided.
+#
+#   - Functions defined in the main program are not to be prefixed,
+#     functions in "library files" are to be prefixed with "mtr_" (for
+#     Mysql-Test-Run). There are some exceptions, code that fits best in
+#     the main program, but are put into separate files to avoid
+#     clutter, may be without prefix.
+#
+#   - All stat/opendir/-f/ is to be kept in collect_test_cases(). It
+#     will create a struct that the rest of the program can use to get
+#     the information. This separates the "find information" from the
+#     "do the work" and makes the program more easy to maintain.
+#
+#   - The rule when it comes to the logic of this program is
+#
+#       command_line_setup() - is to handle the logic between flags
+#       collect_test_cases() - is to do its best to select what tests
+#                              to run, dig out options, if needs restart etc.
+#       run_testcase()       - is to run a single testcase, and follow the
+#                              logic set in both above. No, or rare file
+#                              system operations. If a test seems complex,
+#                              it should probably not be here.
+#
+# A nice way to trace the execution of this script while debugging
+# is to use the Devel::Trace package found at
+# "http://www.plover.com/~mjd/perl/Trace/" and run this script like
+# "perl -d:Trace mysql-test-run.pl"
+#
+
+
+use lib "lib/v1/";
+
+$Devel::Trace::TRACE= 0;       # Don't trace boring init stuff
+
+#require 5.6.1;
+use File::Path;
+use File::Basename;
+use File::Copy;
+use File::Temp qw /tempdir/;
+use File::Spec::Functions qw /splitdir/;
+use Cwd;
+use Getopt::Long;
+use IO::Socket;
+use IO::Socket::INET;
+use strict;
+use warnings;
+
+select(STDOUT);
+$| = 1; # Automatically flush STDOUT
+
+our $glob_win32_perl=  ($^O eq "MSWin32"); # ActiveState Win32 Perl
+our $glob_cygwin_perl= ($^O eq "cygwin");  # Cygwin Perl
+our $glob_win32=       ($glob_win32_perl or $glob_cygwin_perl);
+our $glob_netware=     ($^O eq "NetWare"); # NetWare
+
+require "lib/v1/mtr_cases.pl";
+require "lib/v1/mtr_im.pl";
+require "lib/v1/mtr_process.pl";
+require "lib/v1/mtr_timer.pl";
+require "lib/v1/mtr_io.pl";
+require "lib/v1/mtr_gcov.pl";
+require "lib/v1/mtr_gprof.pl";
+require "lib/v1/mtr_report.pl";
+require "lib/v1/mtr_match.pl";
+require "lib/v1/mtr_misc.pl";
+require "lib/v1/mtr_stress.pl";
+require "lib/v1/mtr_unique.pl";
+
+$Devel::Trace::TRACE= 1;
+
+##############################################################################
+#
+#  Default settings
+#
+##############################################################################
+
+# Misc global variables
+our $mysql_version_id;
+our $glob_mysql_test_dir=         undef;
+our $glob_mysql_bench_dir=        undef;
+our $glob_scriptname=             undef;
+our $glob_timers=                 undef;
+our $glob_use_embedded_server=    0;
+our @glob_test_mode;
+
+our $glob_basedir;
+
+our $path_charsetsdir;
+our $path_client_bindir;
+our $path_client_libdir;
+our $path_share;
+our $path_language;
+our $path_timefile;
+our $path_snapshot;
+our $path_mysqltest_log;
+our $path_current_test_log;
+our $path_my_basedir;
+
+our $opt_vardir;                 # A path but set directly on cmd line
+our $path_vardir_trace;          # unix formatted opt_vardir for trace files
+our $opt_tmpdir;                 # A path but set directly on cmd line
+
+# Visual Studio produces executables in different sub-directories based on the
+# configuration used to build them.  To make life easier, an environment
+# variable or command-line option may be specified to control which set of
+# executables will be used by the test suite.
+our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+
+our $default_vardir;
+
+our $opt_usage;
+our $opt_suites;
+our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
+our $opt_verbose= 0;  # Verbose output, enable with --verbose
+
+our $exe_master_mysqld;
+our $exe_mysql;
+our $exe_mysqladmin;
+our $exe_mysql_upgrade;
+our $exe_mysqlbinlog;
+our $exe_mysql_client_test;
+our $exe_bug25714;
+our $exe_mysqld;
+our $exe_mysqlcheck;
+our $exe_mysqldump;
+our $exe_mysqlslap;
+our $exe_mysqlimport;
+our $exe_mysqlshow;
+our $exe_mysql_fix_system_tables;
+our $file_mysql_fix_privilege_tables;
+our $exe_mysqltest;
+our $exe_ndbd;
+our $exe_ndb_mgmd;
+our $exe_slave_mysqld;
+our $exe_im;
+our $exe_my_print_defaults;
+our $exe_perror;
+our $lib_udf_example;
+our $lib_example_plugin;
+our $exe_libtool;
+
+our $opt_bench= 0;
+our $opt_small_bench= 0;
+our $opt_big_test= 0;
+
+our @opt_combinations;
+our $opt_skip_combination;
+
+our @opt_extra_mysqld_opt;
+
+our $opt_compress;
+our $opt_ssl;
+our $opt_skip_ssl;
+our $opt_ssl_supported;
+our $opt_ps_protocol;
+our $opt_sp_protocol;
+our $opt_cursor_protocol;
+our $opt_view_protocol;
+
+our $opt_debug;
+our $opt_do_test;
+our @opt_cases;                  # The test cases names in argv
+our $opt_embedded_server;
+
+our $opt_extern= 0;
+our $opt_socket;
+
+our $opt_fast;
+our $opt_force;
+our $opt_reorder= 0;
+our $opt_enable_disabled;
+our $opt_mem= $ENV{'MTR_MEM'};
+
+our $opt_gcov;
+our $opt_gcov_err;
+our $opt_gcov_msg;
+
+our $glob_debugger= 0;
+our $opt_gdb;
+our $opt_client_gdb;
+our $opt_ddd;
+our $opt_client_ddd;
+our $opt_manual_gdb;
+our $opt_manual_ddd;
+our $opt_manual_debug;
+our $opt_mtr_build_thread=0;
+our $opt_debugger;
+our $opt_client_debugger;
+
+our $opt_gprof;
+our $opt_gprof_dir;
+our $opt_gprof_master;
+our $opt_gprof_slave;
+
+our $master;
+our $slave;
+our $clusters;
+
+our $instance_manager;
+
+our $opt_master_myport;
+our $opt_slave_myport;
+our $im_port;
+our $im_mysqld1_port;
+our $im_mysqld2_port;
+our $opt_ndbcluster_port;
+our $opt_ndbconnectstring;
+our $opt_ndbcluster_port_slave;
+our $opt_ndbconnectstring_slave;
+
+our $opt_record;
+my $opt_report_features;
+our $opt_check_testcases;
+our $opt_mark_progress;
+
+our $opt_skip_rpl;
+our $max_slave_num= 0;
+our $max_master_num= 1;
+our $use_innodb;
+our $opt_skip_test;
+our $opt_skip_im;
+
+our $opt_sleep;
+
+our $opt_testcase_timeout;
+our $opt_suite_timeout;
+my  $default_testcase_timeout=     15; # 15 min max
+my  $default_suite_timeout=       300; # 5 hours max
+
+our $opt_start_and_exit;
+our $opt_start_dirty;
+our $opt_start_from;
+
+our $opt_strace_client;
+
+our $opt_timer= 1;
+
+our $opt_user;
+
+my $opt_valgrind= 0;
+my $opt_valgrind_mysqld= 0;
+my $opt_valgrind_mysqltest= 0;
+my @default_valgrind_args= ("--show-reachable=yes");
+my @valgrind_args;
+my $opt_valgrind_path;
+my $opt_callgrind;
+
+our $opt_stress=               "";
+our $opt_stress_suite=     "main";
+our $opt_stress_mode=    "random";
+our $opt_stress_threads=        5;
+our $opt_stress_test_count=     0;
+our $opt_stress_loop_count=     0;
+our $opt_stress_test_duration=  0;
+our $opt_stress_init_file=     "";
+our $opt_stress_test_file=     "";
+
+our $opt_warnings;
+
+our $opt_skip_ndbcluster= 0;
+our $opt_skip_ndbcluster_slave= 0;
+our $opt_with_ndbcluster= 0;
+our $opt_with_ndbcluster_only= 0;
+our $glob_ndbcluster_supported= 0;
+our $opt_ndb_extra_test= 0;
+our $opt_skip_master_binlog= 0;
+our $opt_skip_slave_binlog= 0;
+
+our $exe_ndb_mgm;
+our $exe_ndb_waiter;
+our $path_ndb_tools_dir;
+our $path_ndb_examples_dir;
+our $exe_ndb_example;
+our $path_ndb_testrun_log;
+
+our $path_sql_dir;
+
+our @data_dir_lst;
+
+our $used_binlog_format;
+our $used_default_engine;
+our $debug_compiled_binaries;
+
+our %mysqld_variables;
+
+my $source_dist= 0;
+
+our $opt_max_save_core= 5;
+my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.
+
+######################################################################
+#
+#  Function declarations
+#
+######################################################################
+
+sub main ();
+sub initial_setup ();
+sub command_line_setup ();
+sub set_mtr_build_thread_ports($);
+sub datadir_list_setup ();
+sub executable_setup ();
+sub environment_setup ();
+sub kill_running_servers ();
+sub remove_stale_vardir ();
+sub setup_vardir ();
+sub check_ssl_support ($);
+sub check_running_as_root();
+sub check_ndbcluster_support ($);
+sub rm_ndbcluster_tables ($);
+sub ndbcluster_start_install ($);
+sub ndbcluster_start ($$);
+sub ndbcluster_wait_started ($$);
+sub mysqld_wait_started($);
+sub run_benchmarks ($);
+sub initialize_servers ();
+sub mysql_install_db ();
+sub install_db ($$);
+sub copy_install_db ($$);
+sub run_testcase ($);
+sub run_testcase_stop_servers ($$$);
+sub run_testcase_start_servers ($);
+sub run_testcase_check_skip_test($);
+sub report_failure_and_restart ($);
+sub do_before_start_master ($);
+sub do_before_start_slave ($);
+sub ndbd_start ($$$);
+sub ndb_mgmd_start ($);
+sub mysqld_start ($$$);
+sub mysqld_arguments ($$$$);
+sub stop_all_servers ();
+sub run_mysqltest ($);
+sub usage ($);
+
+
+######################################################################
+#
+#  Main program
+#
+######################################################################
+
+main();
+
+sub main () {
+
+  command_line_setup();
+
+  check_ndbcluster_support(\%mysqld_variables);
+  check_ssl_support(\%mysqld_variables);
+  check_debug_support(\%mysqld_variables);
+
+  executable_setup();
+
+  environment_setup();
+  signal_setup();
+
+  if ( $opt_gcov )
+  {
+    gcov_prepare();
+  }
+
+  if ( $opt_gprof )
+  {
+    gprof_prepare();
+  }
+
+  if ( $opt_bench )
+  {
+    initialize_servers();
+    run_benchmarks(shift);      # Shift what? Extra arguments?!
+  }
+  elsif ( $opt_stress )
+  {
+    initialize_servers();
+    run_stress_test()
+  }
+  else
+  {
+    # Figure out which tests we are going to run
+    if (!$opt_suites)
+    {
+      $opt_suites= $opt_suites_default;
+
+      # Check for any extra suites to enable based on the path name
+      my %extra_suites=
+	(
+	 "mysql-5.1-new-ndb"              => "ndb_team",
+	 "mysql-5.1-new-ndb-merge"        => "ndb_team",
+	 "mysql-5.1-telco-6.2"            => "ndb_team",
+	 "mysql-5.1-telco-6.2-merge"      => "ndb_team",
+	 "mysql-5.1-telco-6.3"            => "ndb_team",
+	 "mysql-6.0-ndb"                  => "ndb_team",
+	);
+
+      foreach my $dir ( reverse splitdir($glob_basedir) )
+      {
+	my $extra_suite= $extra_suites{$dir};
+	if (defined $extra_suite){
+	  mtr_report("Found extra suite: $extra_suite");
+	  $opt_suites= "$extra_suite,$opt_suites";
+	  last;
+	}
+      }
+    }
+
+    my $tests= collect_test_cases($opt_suites);
+
+    # Turn off NDB and other similar options if no tests use it
+    my ($need_ndbcluster,$need_im);
+    foreach my $test (@$tests)
+    {
+      next if $test->{skip};
+
+      if (!$opt_extern)
+      {
+	$need_ndbcluster||= $test->{ndb_test};
+	$need_im||= $test->{component_id} eq 'im';
+
+	# Count max number of slaves used by a test case
+	if ( $test->{slave_num} > $max_slave_num) {
+	  $max_slave_num= $test->{slave_num};
+	  mtr_error("Too many slaves") if $max_slave_num > 3;
+	}
+
+	# Count max number of masters used by a test case
+	if ( $test->{master_num} > $max_master_num) {
+	  $max_master_num= $test->{master_num};
+	  mtr_error("Too many masters") if $max_master_num > 2;
+	  mtr_error("Too few masters") if $max_master_num < 1;
+	}
+      }
+      $use_innodb||= $test->{'innodb_test'};
+    }
+
+    # Check if cluster can be skipped
+    if ( !$need_ndbcluster )
+    {
+      $opt_skip_ndbcluster= 1;
+      $opt_skip_ndbcluster_slave= 1;
+    }
+
+    # Check if slave cluster can be skipped
+    if ($max_slave_num == 0)
+    {
+      $opt_skip_ndbcluster_slave= 1;
+    }
+
+    # Check if im can be skipped
+    if ( ! $need_im )
+    {
+     $opt_skip_im= 1;
+    }
+
+    initialize_servers();
+
+    if ( $opt_report_features ) {
+      run_report_features();
+    }
+
+    run_tests($tests);
+  }
+
+  mtr_exit(0);
+}
+
+##############################################################################
+#
+#  Default settings
+#
+##############################################################################
+
+#
+# When an option is no longer used by this program, it must be explicitly
+# ignored or else it will be passed through to mysqld.  GetOptions will call
+# this subroutine once for each such option on the command line.  See
+# Getopt::Long documentation.
+#
+
+sub warn_about_removed_option {
+  my ($option, $value, $hash_value) = @_;
+
+  warn "WARNING: This option is no longer used, and is ignored: --$option\n";
+}
+
+sub command_line_setup () {
+
+  # These are defaults for things that are set on the command line
+
+  my $opt_comment;
+
+  # Magic number -69.4 results in traditional test ports starting from 9306.
+  set_mtr_build_thread_ports(-69.4);
+
+  # If so requested, we try to avail ourselves of a unique build thread number.
+  if ( $ENV{'MTR_BUILD_THREAD'} ) {
+    if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) {
+      print "Requesting build thread... ";
+      $ENV{'MTR_BUILD_THREAD'} = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
+      print "got ".$ENV{'MTR_BUILD_THREAD'}."\n";
+    }
+  }
+
+  if ( $ENV{'MTR_BUILD_THREAD'} )
+  {
+    set_mtr_build_thread_ports($ENV{'MTR_BUILD_THREAD'});
+  }
+
+  # This is needed for test log evaluation in "gen-build-status-page"
+  # in all cases where the calling tool does not log the commands
+  # directly before it executes them, like "make test-force-pl" in RPM builds.
+  print "Logging: $0 ", join(" ", @ARGV), "\n";
+
+  # Read the command line
+  # Note: Keep list, and the order, in sync with usage at end of this file
+
+  # Options that are no longer used must still be processed, because all
+  # unprocessed options are passed directly to mysqld.  The user will be
+  # warned that the option is being ignored.
+  #
+  # Put the complete option string here.  For example, to remove the --suite
+  # option, remove it from GetOptions() below and put 'suite|suites=s' here.
+  my @removed_options = (
+  );
+
+  Getopt::Long::Configure("pass_through");
+  GetOptions(
+             # Control what engine/variation to run
+             'embedded-server'          => \$opt_embedded_server,
+             'ps-protocol'              => \$opt_ps_protocol,
+             'sp-protocol'              => \$opt_sp_protocol,
+             'view-protocol'            => \$opt_view_protocol,
+             'cursor-protocol'          => \$opt_cursor_protocol,
+             'ssl|with-openssl'         => \$opt_ssl,
+             'skip-ssl'                 => \$opt_skip_ssl,
+             'compress'                 => \$opt_compress,
+             'bench'                    => \$opt_bench,
+             'small-bench'              => \$opt_small_bench,
+             'with-ndbcluster|ndb'      => \$opt_with_ndbcluster,
+             'vs-config'            => \$opt_vs_config,
+
+             # Control what test suites or cases to run
+             'force'                    => \$opt_force,
+             'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,
+             'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
+             'skip-ndbcluster-slave|skip-ndb-slave'
+                                        => \$opt_skip_ndbcluster_slave,
+             'ndb-extra-test'           => \$opt_ndb_extra_test,
+             'skip-master-binlog'       => \$opt_skip_master_binlog,
+             'skip-slave-binlog'        => \$opt_skip_slave_binlog,
+             'do-test=s'                => \$opt_do_test,
+             'start-from=s'             => \$opt_start_from,
+             'suite|suites=s'           => \$opt_suites,
+             'skip-rpl'                 => \$opt_skip_rpl,
+             'skip-im'                  => \$opt_skip_im,
+             'skip-test=s'              => \$opt_skip_test,
+             'big-test'                 => \$opt_big_test,
+             'combination=s'            => \@opt_combinations,
+             'skip-combination'         => \$opt_skip_combination,
+
+             # Specify ports
+             'master_port=i'            => \$opt_master_myport,
+             'slave_port=i'             => \$opt_slave_myport,
+             'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port,
+             'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
+             'im-port=i'                => \$im_port, # Instance Manager port.
+             'im-mysqld1-port=i'        => \$im_mysqld1_port, # Port of mysqld, controlled by IM
+             'im-mysqld2-port=i'        => \$im_mysqld2_port, # Port of mysqld, controlled by IM
+	     'mtr-build-thread=i'       => \$opt_mtr_build_thread,
+
+             # Test case authoring
+             'record'                   => \$opt_record,
+             'check-testcases'          => \$opt_check_testcases,
+             'mark-progress'            => \$opt_mark_progress,
+
+             # Extra options used when starting mysqld
+             'mysqld=s'                 => \@opt_extra_mysqld_opt,
+
+             # Run test on running server
+             'extern'                   => \$opt_extern,
+             'ndb-connectstring=s'       => \$opt_ndbconnectstring,
+             'ndb-connectstring-slave=s' => \$opt_ndbconnectstring_slave,
+
+             # Debugging
+             'gdb'                      => \$opt_gdb,
+             'client-gdb'               => \$opt_client_gdb,
+             'manual-gdb'               => \$opt_manual_gdb,
+             'manual-debug'             => \$opt_manual_debug,
+             'ddd'                      => \$opt_ddd,
+             'client-ddd'               => \$opt_client_ddd,
+             'manual-ddd'               => \$opt_manual_ddd,
+	     'debugger=s'               => \$opt_debugger,
+	     'client-debugger=s'        => \$opt_client_debugger,
+             'strace-client'            => \$opt_strace_client,
+             'master-binary=s'          => \$exe_master_mysqld,
+             'slave-binary=s'           => \$exe_slave_mysqld,
+             'max-save-core=i'          => \$opt_max_save_core,
+
+             # Coverage, profiling etc
+             'gcov'                     => \$opt_gcov,
+             'gprof'                    => \$opt_gprof,
+             'valgrind|valgrind-all'    => \$opt_valgrind,
+             'valgrind-mysqltest'       => \$opt_valgrind_mysqltest,
+             'valgrind-mysqld'          => \$opt_valgrind_mysqld,
+             'valgrind-options=s'       => sub {
+	       my ($opt, $value)= @_;
+	       # Deprecated option unless it's what we know pushbuild uses
+	       if ($value eq "--gen-suppressions=all --show-reachable=yes") {
+		 push(@valgrind_args, $_) for (split(' ', $value));
+		 return;
+	       }
+	       die("--valgrind-options=s is deprecated. Use ",
+		   "--valgrind-option=s, to be specified several",
+		   " times if necessary");
+	     },
+             'valgrind-option=s'        => \@valgrind_args,
+             'valgrind-path=s'          => \$opt_valgrind_path,
+	     'callgrind'                => \$opt_callgrind,
+
+             # Stress testing 
+             'stress'                   => \$opt_stress,
+             'stress-suite=s'           => \$opt_stress_suite,
+             'stress-threads=i'         => \$opt_stress_threads,
+             'stress-test-file=s'       => \$opt_stress_test_file,
+             'stress-init-file=s'       => \$opt_stress_init_file,
+             'stress-mode=s'            => \$opt_stress_mode,
+             'stress-loop-count=i'      => \$opt_stress_loop_count,
+             'stress-test-count=i'      => \$opt_stress_test_count,
+             'stress-test-duration=i'   => \$opt_stress_test_duration,
+
+	     # Directories
+             'tmpdir=s'                 => \$opt_tmpdir,
+             'vardir=s'                 => \$opt_vardir,
+             'benchdir=s'               => \$glob_mysql_bench_dir,
+             'mem'                      => \$opt_mem,
+             'client-bindir=s'          => \$path_client_bindir,
+             'client-libdir=s'          => \$path_client_libdir,
+
+             # Misc
+             'report-features'          => \$opt_report_features,
+             'comment=s'                => \$opt_comment,
+             'debug'                    => \$opt_debug,
+             'fast'                     => \$opt_fast,
+             'reorder'                  => \$opt_reorder,
+             'enable-disabled'          => \$opt_enable_disabled,
+             'script-debug'             => \$opt_script_debug,
+             'verbose'                  => \$opt_verbose,
+             'sleep=i'                  => \$opt_sleep,
+             'socket=s'                 => \$opt_socket,
+             'start-dirty'              => \$opt_start_dirty,
+             'start-and-exit'           => \$opt_start_and_exit,
+             'timer!'                   => \$opt_timer,
+             'user=s'                   => \$opt_user,
+             'testcase-timeout=i'       => \$opt_testcase_timeout,
+             'suite-timeout=i'          => \$opt_suite_timeout,
+             'warnings|log-warnings'    => \$opt_warnings,
+
+             # Options which are no longer used
+             (map { $_ => \&warn_about_removed_option } @removed_options),
+
+             'help|h'                   => \$opt_usage,
+            ) or usage("Can't read options");
+
+  usage("") if $opt_usage;
+
+  $glob_scriptname=  basename($0);
+
+  if ($opt_mtr_build_thread != 0)
+  {
+    set_mtr_build_thread_ports($opt_mtr_build_thread)
+  }
+  elsif ($ENV{'MTR_BUILD_THREAD'})
+  {
+    $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'};
+  }
+
+  # We require that we are in the "mysql-test" directory
+  # to run mysql-test-run
+  if (! -f $glob_scriptname)
+  {
+    mtr_error("Can't find the location for the mysql-test-run script\n" .
+              "Go to to the mysql-test directory and execute the script " .
+              "as follows:\n./$glob_scriptname");
+  }
+
+  if ( -d "../sql" )
+  {
+    $source_dist=  1;
+  }
+
+  # Find the absolute path to the test directory
+  $glob_mysql_test_dir=  cwd();
+  if ( $glob_cygwin_perl )
+  {
+    # Windows programs like 'mysqld' needs Windows paths
+    $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;
+    chomp($glob_mysql_test_dir);
+  }
+  $default_vardir= "$glob_mysql_test_dir/var";
+
+  # In most cases, the base directory we find everything relative to,
+  # is the parent directory of the "mysql-test" directory. For source
+  # distributions, TAR binary distributions and some other packages.
+  $glob_basedir= dirname($glob_mysql_test_dir);
+
+  # In the RPM case, binaries and libraries are installed in the
+  # default system locations, instead of having our own private base
+  # directory. And we install "/usr/share/mysql-test". Moving up one
+  # more directory relative to "mysql-test" gives us a usable base
+  # directory for RPM installs.
+  if ( ! $source_dist and ! -d "$glob_basedir/bin" )
+  {
+    $glob_basedir= dirname($glob_basedir);
+  }
+
+  # Expect mysql-bench to be located adjacent to the source tree, by default
+  $glob_mysql_bench_dir= "$glob_basedir/../mysql-bench"
+    unless defined $glob_mysql_bench_dir;
+  $glob_mysql_bench_dir= undef
+    unless -d $glob_mysql_bench_dir;
+
+  $path_my_basedir=
+    $source_dist ? $glob_mysql_test_dir : $glob_basedir;
+
+  $glob_timers= mtr_init_timers();
+
+  # --------------------------------------------------------------------------
+  # Embedded server flag
+  # --------------------------------------------------------------------------
+  if ( $opt_embedded_server )
+  {
+    $glob_use_embedded_server= 1;
+    # Add the location for libmysqld.dll to the path.
+    if ( $glob_win32 )
+    {
+      my $lib_mysqld=
+        mtr_path_exists(vs_config_dirs('libmysqld',''));
+	  $lib_mysqld= $glob_cygwin_perl ? ":".`cygpath "$lib_mysqld"` 
+                                     : ";".$lib_mysqld;
+      chomp($lib_mysqld);
+      $ENV{'PATH'}="$ENV{'PATH'}".$lib_mysqld;
+    }
+
+    push(@glob_test_mode, "embedded");
+    $opt_skip_rpl= 1;              # We never run replication with embedded
+    $opt_skip_ndbcluster= 1;       # Turn off use of NDB cluster
+    $opt_skip_ssl= 1;              # Turn off use of SSL
+
+    # Turn off use of bin log
+    push(@opt_extra_mysqld_opt, "--skip-log-bin");
+
+    if ( $opt_extern )
+    {
+      mtr_error("Can't use --extern with --embedded-server");
+    }
+  }
+
+  #
+  # Find the mysqld executable to be able to find the mysqld version
+  # number as early as possible
+  #
+
+  # Look for the client binaries directory
+  if ($path_client_bindir)
+  {
+    # --client-bindir=path set on command line, check that the path exists
+    $path_client_bindir= mtr_path_exists($path_client_bindir);
+  }
+  else
+  {
+    $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
+					 "$glob_basedir/client_debug",
+					 vs_config_dirs('client', ''),
+					 "$glob_basedir/client",
+					 "$glob_basedir/bin");
+  }
+  
+  # Look for language files and charsetsdir, use same share
+  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
+                                    "$glob_basedir/sql/share",
+                                    "$glob_basedir/share");
+
+  $path_language=      mtr_path_exists("$path_share/english");
+  $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
+
+
+  if (!$opt_extern)
+  {
+    $exe_mysqld=       mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
+                                       vs_config_dirs('sql', 'mysqld-debug'),
+				       "$glob_basedir/sql/mysqld",
+				       "$path_client_bindir/mysqld-max-nt",
+				       "$path_client_bindir/mysqld-max",
+				       "$path_client_bindir/mysqld-nt",
+				       "$path_client_bindir/mysqld",
+				       "$path_client_bindir/mysqld-debug",
+				       "$path_client_bindir/mysqld-max",
+				       "$glob_basedir/libexec/mysqld",
+				       "$glob_basedir/bin/mysqld",
+				       "$glob_basedir/sbin/mysqld");
+
+    # Use the mysqld found above to find out what features are available
+    collect_mysqld_features();
+  }
+  else
+  {
+    $mysqld_variables{'port'}= 3306;
+    $mysqld_variables{'master-port'}= 3306;
+  }
+
+  if ( $opt_comment )
+  {
+    print "\n";
+    print '#' x 78, "\n";
+    print "# $opt_comment\n";
+    print '#' x 78, "\n\n";
+  }
+
+  foreach my $arg ( @ARGV )
+  {
+    if ( $arg =~ /^--skip-/ )
+    {
+      push(@opt_extra_mysqld_opt, $arg);
+    }
+    elsif ( $arg =~ /^--$/ )
+    {
+      # It is an effect of setting 'pass_through' in option processing
+      # that the lone '--' separating options from arguments survives,
+      # simply ignore it.
+    }
+    elsif ( $arg =~ /^-/ )
+    {
+      usage("Invalid option \"$arg\"");
+    }
+    else
+    {
+      push(@opt_cases, $arg);
+    }
+  }
+
+  # --------------------------------------------------------------------------
+  # Find out type of logging that are being used
+  # --------------------------------------------------------------------------
+  if (!$opt_extern && $mysql_version_id >= 50100 )
+  {
+    foreach my $arg ( @opt_extra_mysqld_opt )
+    {
+      if ( $arg =~ /binlog[-_]format=(\S+)/ )
+      {
+      	$used_binlog_format= $1;
+      }
+    }
+    if (defined $used_binlog_format) 
+    {
+      mtr_report("Using binlog format '$used_binlog_format'");
+    }
+    else
+    {
+      mtr_report("Using dynamic switching of binlog format");
+    }
+  }
+
+
+  # --------------------------------------------------------------------------
+  # Find out default storage engine being used(if any)
+  # --------------------------------------------------------------------------
+  if ( $opt_with_ndbcluster )
+  {
+    # --ndb or --with-ndbcluster turns on --default-storage-engine=ndbcluster
+    push(@opt_extra_mysqld_opt, "--default-storage-engine=ndbcluster");
+  }
+
+  foreach my $arg ( @opt_extra_mysqld_opt )
+  {
+    if ( $arg =~ /default-storage-engine=(\S+)/ )
+    {
+      $used_default_engine= $1;
+    }
+  }
+  mtr_report("Using default engine '$used_default_engine'")
+    if defined $used_default_engine;
+
+  # --------------------------------------------------------------------------
+  # Check if we should speed up tests by trying to run on tmpfs
+  # --------------------------------------------------------------------------
+  if ( defined $opt_mem )
+  {
+    mtr_error("Can't use --mem and --vardir at the same time ")
+      if $opt_vardir;
+    mtr_error("Can't use --mem and --tmpdir at the same time ")
+      if $opt_tmpdir;
+
+    # Search through list of locations that are known
+    # to be "fast disks" to list to find a suitable location
+    # Use --mem=<dir> as first location to look.
+    my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");
+
+    foreach my $fs (@tmpfs_locations)
+    {
+      if ( -d $fs )
+      {
+	mtr_report("Using tmpfs in $fs");
+	$opt_mem= "$fs/var";
+	$opt_mem .= $opt_mtr_build_thread if $opt_mtr_build_thread;
+	last;
+      }
+    }
+  }
+
+  # --------------------------------------------------------------------------
+  # Set the "var/" directory, as it is the base for everything else
+  # --------------------------------------------------------------------------
+  if ( ! $opt_vardir )
+  {
+    $opt_vardir= $default_vardir;
+  }
+  elsif ( $mysql_version_id < 50000 and
+	  $opt_vardir ne $default_vardir)
+  {
+    # Version 4.1 and --vardir was specified
+    # Only supported as a symlink from var/
+    # by setting up $opt_mem that symlink will be created
+    if ( ! $glob_win32 )
+    {
+      # Only platforms that have native symlinks can use the vardir trick
+      $opt_mem= $opt_vardir;
+      mtr_report("Using 4.1 vardir trick");
+    }
+
+    $opt_vardir= $default_vardir;
+  }
+
+  $path_vardir_trace= $opt_vardir;
+  # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
+  $path_vardir_trace=~ s/^\w://;
+
+  # We make the path absolute, as the server will do a chdir() before usage
+  unless ( $opt_vardir =~ m,^/, or
+           ($glob_win32 and $opt_vardir =~ m,^[a-z]:/,i) )
+  {
+    # Make absolute path, relative test dir
+    $opt_vardir= "$glob_mysql_test_dir/$opt_vardir";
+  }
+
+  # --------------------------------------------------------------------------
+  # Set tmpdir
+  # --------------------------------------------------------------------------
+  $opt_tmpdir=       "$opt_vardir/tmp" unless $opt_tmpdir;
+  $opt_tmpdir =~ s,/+$,,;       # Remove ending slash if any
+
+  # --------------------------------------------------------------------------
+  # Check im suport
+  # --------------------------------------------------------------------------
+  if ($opt_extern)
+  {
+    mtr_report("Disable instance manager when running with extern mysqld");
+    $opt_skip_im= 1;
+  }
+  elsif ( $mysql_version_id < 50000 )
+  {
+    # Instance manager is not supported until 5.0
+    $opt_skip_im= 1;
+  }
+  elsif ( $glob_win32 )
+  {
+    mtr_report("Disable Instance manager - testing not supported on Windows");
+    $opt_skip_im= 1;
+  }
+
+  # --------------------------------------------------------------------------
+  # Record flag
+  # --------------------------------------------------------------------------
+  if ( $opt_record and ! @opt_cases )
+  {
+    mtr_error("Will not run in record mode without a specific test case");
+  }
+
+  if ( $opt_record )
+  {
+    $opt_skip_combination = 1;
+  }
+
+  # --------------------------------------------------------------------------
+  # ps protcol flag
+  # --------------------------------------------------------------------------
+  if ( $opt_ps_protocol )
+  {
+    push(@glob_test_mode, "ps-protocol");
+  }
+
+  # --------------------------------------------------------------------------
+  # Bench flags
+  # --------------------------------------------------------------------------
+  if ( $opt_small_bench )
+  {
+    $opt_bench=  1;
+  }
+
+  # --------------------------------------------------------------------------
+  # Big test flags
+  # --------------------------------------------------------------------------
+   if ( $opt_big_test )
+   {
+     $ENV{'BIG_TEST'}= 1;
+   }
+
+  # --------------------------------------------------------------------------
+  # Gcov flag
+  # --------------------------------------------------------------------------
+  if ( $opt_gcov and ! $source_dist )
+  {
+    mtr_error("Coverage test needs the source - please use source dist");
+  }
+
+  # --------------------------------------------------------------------------
+  # Check debug related options
+  # --------------------------------------------------------------------------
+  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd ||
+       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug ||
+       $opt_debugger || $opt_client_debugger )
+  {
+    # Indicate that we are using debugger
+    $glob_debugger= 1;
+    if ( $opt_extern )
+    {
+      mtr_error("Can't use --extern when using debugger");
+    }
+  }
+
+  # --------------------------------------------------------------------------
+  # Check if special exe was selected for master or slave
+  # --------------------------------------------------------------------------
+  $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;
+  $exe_slave_mysqld=  $exe_slave_mysqld  || $exe_mysqld;
+
+  # --------------------------------------------------------------------------
+  # Check valgrind arguments
+  # --------------------------------------------------------------------------
+  if ( $opt_valgrind or $opt_valgrind_path or @valgrind_args)
+  {
+    mtr_report("Turning on valgrind for all executables");
+    $opt_valgrind= 1;
+    $opt_valgrind_mysqld= 1;
+    $opt_valgrind_mysqltest= 1;
+  }
+  elsif ( $opt_valgrind_mysqld )
+  {
+    mtr_report("Turning on valgrind for mysqld(s) only");
+    $opt_valgrind= 1;
+  }
+  elsif ( $opt_valgrind_mysqltest )
+  {
+    mtr_report("Turning on valgrind for mysqltest and mysql_client_test only");
+    $opt_valgrind= 1;
+  }
+
+  if ( $opt_callgrind )
+  {
+    mtr_report("Turning on valgrind with callgrind for mysqld(s)");
+    $opt_valgrind= 1;
+    $opt_valgrind_mysqld= 1;
+
+    # Set special valgrind options unless options passed on command line
+    push(@valgrind_args, "--trace-children=yes")
+      unless @valgrind_args;
+  }
+
+  if ( $opt_valgrind )
+  {
+    # Set valgrind_options to default unless already defined
+    push(@valgrind_args, @default_valgrind_args)
+      unless @valgrind_args;
+
+    mtr_report("Running valgrind with options \"",
+	       join(" ", @valgrind_args), "\"");
+  }
+
+  if ( ! $opt_testcase_timeout )
+  {
+    $opt_testcase_timeout= $default_testcase_timeout;
+    $opt_testcase_timeout*= 10 if $opt_valgrind;
+    $opt_testcase_timeout*= 10 if ($opt_debug and $glob_win32);
+  }
+
+  if ( ! $opt_suite_timeout )
+  {
+    $opt_suite_timeout= $default_suite_timeout;
+    $opt_suite_timeout*= 6 if $opt_valgrind;
+    $opt_suite_timeout*= 6 if ($opt_debug and $glob_win32);
+  }
+
+  if ( ! $opt_user )
+  {
+    if ( $opt_extern )
+    {
+      $opt_user= "test";
+    }
+    else
+    {
+      $opt_user= "root"; # We want to do FLUSH xxx commands
+    }
+  }
+
+  # On QNX, /tmp/dir/master.sock and /tmp/dir//master.sock seem to be
+  # considered different, so avoid the extra slash (/) in the socket
+  # paths.
+  my $sockdir = $opt_tmpdir;
+  $sockdir =~ s|/+$||;
+
+  # On some operating systems, there is a limit to the length of a
+  # UNIX domain socket's path far below PATH_MAX, so try to avoid long
+  # socket path names.
+  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 );
+
+  $master->[0]=
+  {
+   pid           => 0,
+   type          => "master",
+   idx           => 0,
+   path_myddir   => "$opt_vardir/master-data",
+   path_myerr    => "$opt_vardir/log/master.err",
+   path_pid    => "$opt_vardir/run/master.pid",
+   path_sock   => "$sockdir/master.sock",
+   port   =>  $opt_master_myport,
+   start_timeout =>  400, # enough time create innodb tables
+   cluster       =>  0, # index in clusters list
+   start_opts    => [],
+  };
+
+  $master->[1]=
+  {
+   pid           => 0,
+   type          => "master",
+   idx           => 1,
+   path_myddir   => "$opt_vardir/master1-data",
+   path_myerr    => "$opt_vardir/log/master1.err",
+   path_pid    => "$opt_vardir/run/master1.pid",
+   path_sock   => "$sockdir/master1.sock",
+   port   => $opt_master_myport + 1,
+   start_timeout => 400, # enough time create innodb tables
+   cluster       =>  0, # index in clusters list
+   start_opts    => [],
+  };
+
+  $slave->[0]=
+  {
+   pid           => 0,
+   type          => "slave",
+   idx           => 0,
+   path_myddir   => "$opt_vardir/slave-data",
+   path_myerr    => "$opt_vardir/log/slave.err",
+   path_pid    => "$opt_vardir/run/slave.pid",
+   path_sock   => "$sockdir/slave.sock",
+   port   => $opt_slave_myport,
+   start_timeout => 400,
+
+   cluster       =>  1, # index in clusters list
+   start_opts    => [],
+  };
+
+  $slave->[1]=
+  {
+   pid           => 0,
+   type          => "slave",
+   idx           => 1,
+   path_myddir   => "$opt_vardir/slave1-data",
+   path_myerr    => "$opt_vardir/log/slave1.err",
+   path_pid    => "$opt_vardir/run/slave1.pid",
+   path_sock   => "$sockdir/slave1.sock",
+   port   => $opt_slave_myport + 1,
+   start_timeout => 300,
+   cluster       =>  -1, # index in clusters list
+   start_opts    => [],
+  };
+
+  $slave->[2]=
+  {
+   pid           => 0,
+   type          => "slave",
+   idx           => 2,
+   path_myddir   => "$opt_vardir/slave2-data",
+   path_myerr    => "$opt_vardir/log/slave2.err",
+   path_pid    => "$opt_vardir/run/slave2.pid",
+   path_sock   => "$sockdir/slave2.sock",
+   port   => $opt_slave_myport + 2,
+   start_timeout => 300,
+   cluster       =>  -1, # index in clusters list
+   start_opts    => [],
+  };
+
+  $instance_manager=
+  {
+   path_err =>        "$opt_vardir/log/im.err",
+   path_log =>        "$opt_vardir/log/im.log",
+   path_pid =>        "$opt_vardir/run/im.pid",
+   path_angel_pid =>  "$opt_vardir/run/im.angel.pid",
+   path_sock =>       "$sockdir/im.sock",
+   port =>            $im_port,
+   start_timeout =>   $master->[0]->{'start_timeout'},
+   admin_login =>     'im_admin',
+   admin_password =>  'im_admin_secret',
+   admin_sha1 =>      '*598D51AD2DFF7792045D6DF3DDF9AA1AF737B295',
+   password_file =>   "$opt_vardir/im.passwd",
+   defaults_file =>   "$opt_vardir/im.cnf",
+  };
+
+  $instance_manager->{'instances'}->[0]=
+  {
+   server_id    => 1,
+   port         => $im_mysqld1_port,
+   path_datadir => "$opt_vardir/im_mysqld_1.data",
+   path_sock    => "$sockdir/mysqld_1.sock",
+   path_pid     => "$opt_vardir/run/mysqld_1.pid",
+   start_timeout  => 400, # enough time create innodb tables
+   old_log_format => 1
+  };
+
+  $instance_manager->{'instances'}->[1]=
+  {
+   server_id    => 2,
+   port         => $im_mysqld2_port,
+   path_datadir => "$opt_vardir/im_mysqld_2.data",
+   path_sock    => "$sockdir/mysqld_2.sock",
+   path_pid     => "$opt_vardir/run/mysqld_2.pid",
+   nonguarded   => 1,
+   start_timeout  => 400, # enough time create innodb tables
+   old_log_format => 1
+  };
+
+  my $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port";
+  $clusters->[0]=
+  {
+   name            => "Master",
+   nodes           => 2,
+   port            => "$opt_ndbcluster_port",
+   data_dir        => "$data_dir",
+   connect_string  => "host=localhost:$opt_ndbcluster_port",
+   path_pid        => "$data_dir/ndb_3.pid", # Nodes + 1
+   pid             => 0, # pid of ndb_mgmd
+   installed_ok    => 0,
+  };
+
+  $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port_slave";
+  $clusters->[1]=
+  {
+   name            => "Slave",
+   nodes           => 1,
+   port            => "$opt_ndbcluster_port_slave",
+   data_dir        => "$data_dir",
+   connect_string  => "host=localhost:$opt_ndbcluster_port_slave",
+   path_pid        => "$data_dir/ndb_2.pid", # Nodes + 1
+   pid             => 0, # pid of ndb_mgmd
+   installed_ok    => 0,
+  };
+
+  # Init pids of ndbd's
+  foreach my $cluster ( @{$clusters} )
+  {
+    for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ )
+    {
+      my $nodeid= $idx+1;
+      $cluster->{'ndbds'}->[$idx]=
+	{
+	 pid      => 0,
+	 nodeid => $nodeid,
+	 path_pid => "$cluster->{'data_dir'}/ndb_${nodeid}.pid",
+	 path_fs => "$cluster->{'data_dir'}/ndb_${nodeid}_fs",
+	};
+    }
+  }
+
+  # --------------------------------------------------------------------------
+  # extern
+  # --------------------------------------------------------------------------
+  if ( $opt_extern )
+  {
+    # Turn off features not supported when running with extern server
+    $opt_skip_rpl= 1;
+    $opt_skip_ndbcluster= 1;
+
+    # Setup master->[0] with the settings for the extern server
+    $master->[0]->{'path_sock'}=  $opt_socket ? $opt_socket : "/tmp/mysql.sock";
+    mtr_report("Using extern server at '$master->[0]->{path_sock}'");
+  }
+  else
+  {
+    mtr_error("--socket can only be used in combination with --extern")
+      if $opt_socket;
+  }
+
+
+  # --------------------------------------------------------------------------
+  # ndbconnectstring and ndbconnectstring_slave
+  # --------------------------------------------------------------------------
+  if ( $opt_ndbconnectstring )
+  {
+    # ndbconnectstring was supplied by user, the tests shoudl be run
+    # against an already started cluster, change settings
+    my $cluster= $clusters->[0]; # Master cluster
+    $cluster->{'connect_string'}= $opt_ndbconnectstring;
+    $cluster->{'use_running'}= 1;
+
+    mtr_error("Can't specify --ndb-connectstring and --skip-ndbcluster")
+      if $opt_skip_ndbcluster;
+  }
+  $ENV{'NDB_CONNECTSTRING'}= $clusters->[0]->{'connect_string'};
+
+
+  if ( $opt_ndbconnectstring_slave )
+  {
+    # ndbconnectstring-slave was supplied by user, the tests should be run
+    # agains an already started slave cluster, change settings
+    my $cluster= $clusters->[1]; # Slave cluster
+    $cluster->{'connect_string'}= $opt_ndbconnectstring_slave;
+    $cluster->{'use_running'}= 1;
+
+    mtr_error("Can't specify ndb-connectstring_slave and " .
+	      "--skip-ndbcluster-slave")
+      if $opt_skip_ndbcluster_slave;
+  }
+
+
+  $path_timefile=  "$opt_vardir/log/mysqltest-time";
+  $path_mysqltest_log=  "$opt_vardir/log/mysqltest.log";
+  $path_current_test_log= "$opt_vardir/log/current_test";
+  $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";
+
+  $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/";
+
+  if ( $opt_valgrind and $opt_debug )
+  {
+    # When both --valgrind and --debug is selected, send
+    # all output to the trace file, making it possible to
+    # see the exact location where valgrind complains
+    foreach my $mysqld (@{$master}, @{$slave})
+    {
+      my $sidx= $mysqld->{idx} ? "$mysqld->{idx}" : "";
+      $mysqld->{path_myerr}=
+	"$opt_vardir/log/" . $mysqld->{type} . "$sidx.trace";
+    }
+  }
+}
+
+#
+# To make it easier for different devs to work on the same host,
+# an environment variable can be used to control all ports. A small
+# number is to be used, 0 - 16 or similar.
+#
+# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
+# versions of this script, else a 4.0 test run might conflict with a
+# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
+# all port numbers might not be used in this version of the script.
+#
+# Also note the limitation of ports we are allowed to hand out. This
+# differs between operating systems and configuration, see
+# http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
+# But a fairly safe range seems to be 5001 - 32767
+#
+
+sub set_mtr_build_thread_ports($) {
+  my $mtr_build_thread= shift;
+
+  if ( lc($mtr_build_thread) eq 'auto' ) {
+    print "Requesting build thread... ";
+    $ENV{'MTR_BUILD_THREAD'} = $mtr_build_thread = mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
+    print "got ".$mtr_build_thread."\n";
+  }
+
+  # Up to two masters, up to three slaves
+  # A magic value in command_line_setup depends on these equations.
+  $opt_master_myport=         $mtr_build_thread * 10 + 10000; # and 1
+  $opt_slave_myport=          $opt_master_myport + 2;  # and 3 4
+  $opt_ndbcluster_port=       $opt_master_myport + 5;
+  $opt_ndbcluster_port_slave= $opt_master_myport + 6;
+  $im_port=                   $opt_master_myport + 7;
+  $im_mysqld1_port=           $opt_master_myport + 8;
+  $im_mysqld2_port=           $opt_master_myport + 9;
+
+  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
+  {
+    mtr_error("MTR_BUILD_THREAD number results in a port",
+              "outside 5001 - 32767",
+              "($opt_master_myport - $opt_master_myport + 10)");
+  }
+}
+
+
+sub datadir_list_setup () {
+
+  # Make a list of all data_dirs
+  for (my $idx= 0; $idx < $max_master_num; $idx++)
+  {
+    push(@data_dir_lst, $master->[$idx]->{'path_myddir'});
+  }
+
+  for (my $idx= 0; $idx < $max_slave_num; $idx++)
+  {
+    push(@data_dir_lst, $slave->[$idx]->{'path_myddir'});
+  }
+
+  unless ($opt_skip_im)
+  {
+    foreach my $instance (@{$instance_manager->{'instances'}})
+    {
+      push(@data_dir_lst, $instance->{'path_datadir'});
+    }
+  }
+}
+
+
+##############################################################################
+#
+#  Set paths to various executable programs
+#
+##############################################################################
+
+
+sub collect_mysqld_features () {
+  my $found_variable_list_start= 0;
+  my $tmpdir;
+  if ( $opt_tmpdir ) {
+    # Use the requested tmpdir
+    mkpath($opt_tmpdir) if (! -d $opt_tmpdir);
+    $tmpdir= $opt_tmpdir;
+  }
+  else {
+    $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
+  }
+
+  #
+  # Execute "mysqld --help --verbose" to get a list
+  # list of all features and settings
+  #
+  # --no-defaults and --skip-grant-tables are to avoid loading
+  # system-wide configs and plugins
+  #
+  # --datadir must exist, mysqld will chdir into it
+  #
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`;
+
+  foreach my $line (split('\n', $list))
+  {
+    # First look for version
+    if ( !$mysql_version_id )
+    {
+      # Look for version
+      my $exe_name= basename($exe_mysqld);
+      mtr_verbose("exe_name: $exe_name");
+      if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )
+      {
+	#print "Major: $1 Minor: $2 Build: $3\n";
+	$mysql_version_id= $1*10000 + $2*100 + $3;
+	#print "mysql_version_id: $mysql_version_id\n";
+	mtr_report("MySQL Version $1.$2.$3");
+      }
+    }
+    else
+    {
+      if (!$found_variable_list_start)
+      {
+	# Look for start of variables list
+	if ( $line =~ /[\-]+\s[\-]+/ )
+	{
+	  $found_variable_list_start= 1;
+	}
+      }
+      else
+      {
+	# Put variables into hash
+	if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
+	{
+	  # print "$1=\"$2\"\n";
+	  $mysqld_variables{$1}= $2;
+	}
+	else
+	{
+	  # The variable list is ended with a blank line
+	  if ( $line =~ /^[\s]*$/ )
+	  {
+	    last;
+	  }
+	  else
+	  {
+	    # Send out a warning, we should fix the variables that has no
+	    # space between variable name and it's value
+	    # or should it be fixed width column parsing? It does not
+	    # look like that in function my_print_variables in my_getopt.c
+	    mtr_warning("Could not parse variable list line : $line");
+	  }
+	}
+      }
+    }
+  }
+  rmtree($tmpdir) if (!$opt_tmpdir);
+  mtr_error("Could not find version of MySQL") unless $mysql_version_id;
+  mtr_error("Could not find variabes list") unless $found_variable_list_start;
+
+}
+
+
+sub run_query($$) {
+  my ($mysqld, $query)= @_;
+
+  my $args;
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--user=%s", $opt_user);
+  mtr_add_arg($args, "--port=%d", $mysqld->{'port'});
+  mtr_add_arg($args, "--socket=%s", $mysqld->{'path_sock'});
+  mtr_add_arg($args, "--silent"); # Tab separated output
+  mtr_add_arg($args, "-e '%s'", $query);
+
+  my $cmd= "$exe_mysql " . join(' ', @$args);
+  mtr_verbose("cmd: $cmd");
+  return `$cmd`;
+}
+
+
+sub collect_mysqld_features_from_running_server ()
+{
+  my $list= run_query($master->[0], "use mysql; SHOW VARIABLES");
+
+  foreach my $line (split('\n', $list))
+  {
+    # Put variables into hash
+    if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
+    {
+      print "$1=\"$2\"\n";
+      $mysqld_variables{$1}= $2;
+    }
+  }
+}
+
+sub executable_setup_im () {
+
+  # Look for instance manager binary - mysqlmanager
+  $exe_im=
+    mtr_exe_maybe_exists(
+      "$glob_basedir/server-tools/instance-manager/mysqlmanager",
+      "$glob_basedir/libexec/mysqlmanager",
+      "$glob_basedir/bin/mysqlmanager",
+      "$glob_basedir/sbin/mysqlmanager");
+
+  return ($exe_im eq "");
+}
+
+sub executable_setup_ndb () {
+
+  # Look for ndb tols and binaries
+  my $ndb_path= mtr_file_exists("$glob_basedir/ndb",
+				"$glob_basedir/storage/ndb",
+				"$glob_basedir/bin");
+
+  $exe_ndbd=
+    mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
+			 "$ndb_path/ndbd",
+			 "$glob_basedir/libexec/ndbd");
+  $exe_ndb_mgm=
+    mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
+			 "$ndb_path/ndb_mgm");
+  $exe_ndb_mgmd=
+    mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
+			 "$ndb_path/ndb_mgmd",
+			 "$glob_basedir/libexec/ndb_mgmd");
+  $exe_ndb_waiter=
+    mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
+			 "$ndb_path/ndb_waiter");
+
+  # May not exist
+  $path_ndb_tools_dir= mtr_file_exists("$ndb_path/tools",
+				       "$ndb_path");
+  # May not exist
+  $path_ndb_examples_dir=
+    mtr_file_exists("$ndb_path/ndbapi-examples",
+		    "$ndb_path/examples");
+  # May not exist
+  $exe_ndb_example=
+    mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple");
+
+  return ( $exe_ndbd eq "" or
+	   $exe_ndb_mgm eq "" or
+	   $exe_ndb_mgmd eq "" or
+	   $exe_ndb_waiter eq "");
+}
+
+sub executable_setup () {
+
+  #
+  # Check if libtool is available in this distribution/clone
+  # we need it when valgrinding or debugging non installed binary
+  # Otherwise valgrind will valgrind the libtool wrapper or bash
+  # and gdb will not find the real executable to debug
+  #
+  if ( -x "../libtool")
+  {
+    $exe_libtool= "../libtool";
+    if ($opt_valgrind or $glob_debugger)
+    {
+      mtr_report("Using \"$exe_libtool\" when running valgrind or debugger");
+    }
+  }
+
+  # Look for my_print_defaults
+  $exe_my_print_defaults=
+    mtr_exe_exists(vs_config_dirs('extra', 'my_print_defaults'),
+		           "$path_client_bindir/my_print_defaults",
+		           "$glob_basedir/extra/my_print_defaults");
+
+  # Look for perror
+  $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'),
+			                  "$glob_basedir/extra/perror",
+			                  "$path_client_bindir/perror");
+
+  # Look for the client binaries
+  $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");
+  $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
+  $exe_mysqlimport=    mtr_exe_exists("$path_client_bindir/mysqlimport");
+  $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
+  $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
+  $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
+  $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
+
+  if (!$opt_extern)
+  {
+    # Look for SQL scripts directory
+    if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "")
+    {
+      # The SQL scripts are in path_share
+      $path_sql_dir= $path_share;
+    }
+    else
+    {
+      $path_sql_dir= mtr_path_exists("$glob_basedir/share",
+				     "$glob_basedir/scripts");
+    }
+
+    if ( $mysql_version_id >= 50100 )
+    {
+      $exe_mysqlslap=    mtr_exe_exists("$path_client_bindir/mysqlslap");
+    }
+    if ( $mysql_version_id >= 50000 and !$glob_use_embedded_server )
+    {
+      $exe_mysql_upgrade= mtr_exe_exists("$path_client_bindir/mysql_upgrade")
+    }
+    else
+    {
+      $exe_mysql_upgrade= "";
+    }
+
+    if ( ! $glob_win32 )
+    {
+      # Look for mysql_fix_system_table script
+      $exe_mysql_fix_system_tables=
+        mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",
+  			"$path_client_bindir/mysql_fix_privilege_tables");
+    }
+
+    # Look for mysql_fix_privilege_tables.sql script
+    $file_mysql_fix_privilege_tables=
+      mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
+  		    "$glob_basedir/share/mysql_fix_privilege_tables.sql",
+  		    "$glob_basedir/share/mysql/mysql_fix_privilege_tables.sql");
+
+    if ( ! $opt_skip_ndbcluster and executable_setup_ndb())
+    {
+      mtr_warning("Could not find all required ndb binaries, " .
+  		"all ndb tests will fail, use --skip-ndbcluster to " .
+  		"skip testing it.");
+
+      foreach my $cluster (@{$clusters})
+      {
+        $cluster->{"executable_setup_failed"}= 1;
+      }
+    }
+
+    if ( ! $opt_skip_im and executable_setup_im())
+    {
+      mtr_warning("Could not find all required instance manager binaries, " .
+  		"all im tests will fail, use --skip-im to " .
+  		"continue without instance manager");
+      $instance_manager->{"executable_setup_failed"}= 1;
+    }
+
+    # Look for the udf_example library
+    $lib_udf_example=
+      mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'),
+                      "$glob_basedir/sql/.libs/udf_example.so",);
+
+    # Look for the ha_example library
+    $lib_example_plugin=
+      mtr_file_exists(vs_config_dirs('storage/example', 'ha_example.dll'),
+                      "$glob_basedir/storage/example/.libs/ha_example.so",);
+
+  }
+
+  # Look for mysqltest executable
+  if ( $glob_use_embedded_server )
+  {
+    $exe_mysqltest=
+      mtr_exe_exists(vs_config_dirs('libmysqld/examples','mysqltest_embedded'),
+                     "$glob_basedir/libmysqld/examples/mysqltest_embedded",
+                     "$path_client_bindir/mysqltest_embedded");
+  }
+  else
+  {
+    $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+  }
+
+  # Look for mysql_client_test executable which may _not_ exist in
+  # some versions, test using it should be skipped
+  if ( $glob_use_embedded_server )
+  {
+    $exe_mysql_client_test=
+      mtr_exe_maybe_exists(
+        vs_config_dirs('libmysqld/examples', 'mysql_client_test_embedded'),
+        "$glob_basedir/libmysqld/examples/mysql_client_test_embedded");
+  }
+  else
+  {
+    $exe_mysql_client_test=
+      mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'),
+                           "$glob_basedir/tests/mysql_client_test",
+                           "$glob_basedir/bin/mysql_client_test");
+  }
+
+  # Look for bug25714 executable which may _not_ exist in
+  # some versions, test using it should be skipped
+  $exe_bug25714=
+      mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'),
+                           "$glob_basedir/tests/bug25714");
+}
+
+
+sub generate_cmdline_mysqldump ($) {
+  my($mysqld) = @_;
+  return
+    mtr_native_path($exe_mysqldump) .
+      " --no-defaults -uroot --debug-check " .
+      "--port=$mysqld->{'port'} " .
+      "--socket=$mysqld->{'path_sock'} --password=";
+}
+
+
+##############################################################################
+#
+#  Set environment to be used by childs of this process for
+#  things that are constant duting the whole lifetime of mysql-test-run.pl
+#
+##############################################################################
+
+sub mysql_client_test_arguments()
+{
+  my $exe= $exe_mysql_client_test;
+
+  my $args;
+  mtr_init_args(\$args);
+  if ( $opt_valgrind_mysqltest )
+  {
+    valgrind_arguments($args, \$exe);
+  }
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--testcase");
+  mtr_add_arg($args, "--user=root");
+  mtr_add_arg($args, "--port=$master->[0]->{'port'}");
+  mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}");
+
+  if ( $opt_extern || $mysql_version_id >= 50000 )
+  {
+    mtr_add_arg($args, "--vardir=$opt_vardir")
+  }
+
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args,
+      "--debug=d:t:A,$path_vardir_trace/log/mysql_client_test.trace");
+  }
+
+  if ( $glob_use_embedded_server )
+  {
+    mtr_add_arg($args,
+      " -A --language=$path_language");
+    mtr_add_arg($args,
+      " -A --datadir=$slave->[0]->{'path_myddir'}");
+    mtr_add_arg($args,
+      " -A --character-sets-dir=$path_charsetsdir");
+  }
+
+  return join(" ", $exe, @$args);
+}
+
+sub mysql_upgrade_arguments()
+{
+  my $exe= $exe_mysql_upgrade;
+
+  my $args;
+  mtr_init_args(\$args);
+#  if ( $opt_valgrind_mysql_ugrade )
+#  {
+#    valgrind_arguments($args, \$exe);
+#  }
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--user=root");
+  mtr_add_arg($args, "--port=$master->[0]->{'port'}");
+  mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}");
+  mtr_add_arg($args, "--datadir=$master->[0]->{'path_myddir'}");
+  mtr_add_arg($args, "--basedir=$glob_basedir");
+  mtr_add_arg($args, "--tmpdir=$opt_tmpdir");
+
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args,
+      "--debug=d:t:A,$path_vardir_trace/log/mysql_upgrade.trace");
+  }
+
+  return join(" ", $exe, @$args);
+}
+
+# Note that some env is setup in spawn/run, in "mtr_process.pl"
+
+sub environment_setup () {
+
+  umask(022);
+
+  my @ld_library_paths;
+
+  if ($path_client_libdir)
+  {
+    # Use the --client-libdir passed on commandline
+    push(@ld_library_paths, "$path_client_libdir");
+  }
+  else
+  {
+    # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
+    # are used in favor of the system installed ones
+    if ( $source_dist )
+    {
+      push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",
+	   "$glob_basedir/libmysql_r/.libs/",
+	   "$glob_basedir/zlib.libs/");
+    }
+    else
+    {
+      push(@ld_library_paths, "$glob_basedir/lib");
+    }
+  }
+
+ # --------------------------------------------------------------------------
+  # Add the path where libndbclient can be found
+  # --------------------------------------------------------------------------
+  if ( $glob_ndbcluster_supported )
+  {
+    push(@ld_library_paths,  "$glob_basedir/storage/ndb/src/.libs");
+  }
+
+  # --------------------------------------------------------------------------
+  # Valgrind need to be run with debug libraries otherwise it's almost
+  # impossible to add correct supressions, that means if "/usr/lib/debug"
+  # is available, it should be added to
+  # LD_LIBRARY_PATH
+  #
+  # But pthread is broken in libc6-dbg on Debian <= 3.1 (see Debian
+  # bug 399035, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399035),
+  # so don't change LD_LIBRARY_PATH on that platform.
+  # --------------------------------------------------------------------------
+  my $debug_libraries_path= "/usr/lib/debug";
+  my $deb_version;
+  if (  $opt_valgrind and -d $debug_libraries_path and
+        (! -e '/etc/debian_version' or
+	 ($deb_version= mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or
+         $deb_version > 3.1 ) )
+  {
+    push(@ld_library_paths, $debug_libraries_path);
+  }
+
+  $ENV{'LD_LIBRARY_PATH'}= join(":", @ld_library_paths,
+				$ENV{'LD_LIBRARY_PATH'} ?
+				split(':', $ENV{'LD_LIBRARY_PATH'}) : ());
+  mtr_debug("LD_LIBRARY_PATH: $ENV{'LD_LIBRARY_PATH'}");
+
+  $ENV{'DYLD_LIBRARY_PATH'}= join(":", @ld_library_paths,
+				  $ENV{'DYLD_LIBRARY_PATH'} ?
+				  split(':', $ENV{'DYLD_LIBRARY_PATH'}) : ());
+  mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}");
+
+  # The environment variable used for shared libs on AIX
+  $ENV{'SHLIB_PATH'}= join(":", @ld_library_paths,
+                           $ENV{'SHLIB_PATH'} ?
+                           split(':', $ENV{'SHLIB_PATH'}) : ());
+  mtr_debug("SHLIB_PATH: $ENV{'SHLIB_PATH'}");
+
+  # The environment variable used for shared libs on hp-ux
+  $ENV{'LIBPATH'}= join(":", @ld_library_paths,
+                        $ENV{'LIBPATH'} ?
+                        split(':', $ENV{'LIBPATH'}) : ());
+  mtr_debug("LIBPATH: $ENV{'LIBPATH'}");
+
+  # --------------------------------------------------------------------------
+  # Also command lines in .opt files may contain env vars
+  # --------------------------------------------------------------------------
+
+  $ENV{'CHARSETSDIR'}=              $path_charsetsdir;
+  $ENV{'UMASK'}=              "0660"; # The octal *string*
+  $ENV{'UMASK_DIR'}=          "0770"; # The octal *string*
+  
+  #
+  # MySQL tests can produce output in various character sets
+  # (especially, ctype_xxx.test). To avoid confusing Perl
+  # with output which is incompatible with the current locale
+  # settings, we reset the current values of LC_ALL and LC_CTYPE to "C".
+  # For details, please see
+  # Bug#27636 tests fails if LC_* variables set to *_*.UTF-8
+  #
+  $ENV{'LC_ALL'}=             "C";
+  $ENV{'LC_CTYPE'}=           "C";
+  
+  $ENV{'LC_COLLATE'}=         "C";
+  $ENV{'USE_RUNNING_SERVER'}= $opt_extern;
+  $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;
+  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
+  $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
+  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_sock'};
+  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_sock'};
+  $ENV{'MASTER_MYPORT'}=      $master->[0]->{'port'};
+  $ENV{'MASTER_MYPORT1'}=     $master->[1]->{'port'};
+  $ENV{'SLAVE_MYSOCK'}=       $slave->[0]->{'path_sock'};
+  $ENV{'SLAVE_MYPORT'}=       $slave->[0]->{'port'};
+  $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
+  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
+  $ENV{'MYSQL_TCP_PORT'}=     $mysqld_variables{'port'};
+  $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'};
+
+  $ENV{'IM_PATH_SOCK'}=       $instance_manager->{path_sock};
+  $ENV{'IM_USERNAME'}=        $instance_manager->{admin_login};
+  $ENV{'IM_PASSWORD'}=        $instance_manager->{admin_password};
+  $ENV{MTR_BUILD_THREAD}=      $opt_mtr_build_thread;
+
+  $ENV{'EXE_MYSQL'}=          $exe_mysql;
+
+
+  # ----------------------------------------------------
+  # Setup env for NDB
+  # ----------------------------------------------------
+  if ( ! $opt_skip_ndbcluster )
+  {
+    $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;
+
+    $ENV{'NDBCLUSTER_PORT'}=          $opt_ndbcluster_port;
+    $ENV{'NDBCLUSTER_PORT_SLAVE'}=    $opt_ndbcluster_port_slave;
+
+    $ENV{'NDB_EXTRA_TEST'}=           $opt_ndb_extra_test;
+
+    $ENV{'NDB_BACKUP_DIR'}=           $clusters->[0]->{'data_dir'};
+    $ENV{'NDB_DATA_DIR'}=             $clusters->[0]->{'data_dir'};
+    $ENV{'NDB_TOOLS_DIR'}=            $path_ndb_tools_dir;
+    $ENV{'NDB_TOOLS_OUTPUT'}=         $path_ndb_testrun_log;
+
+    if ( $mysql_version_id >= 50000 )
+    {
+      $ENV{'NDB_EXAMPLES_DIR'}=         $path_ndb_examples_dir;
+      $ENV{'MY_NDB_EXAMPLES_BINARY'}=   $exe_ndb_example;
+    }
+    $ENV{'NDB_EXAMPLES_OUTPUT'}=      $path_ndb_testrun_log;
+  }
+
+  # ----------------------------------------------------
+  # Setup env for IM
+  # ----------------------------------------------------
+  if ( ! $opt_skip_im )
+  {
+    $ENV{'IM_EXE'}=             $exe_im;
+    $ENV{'IM_PATH_PID'}=        $instance_manager->{path_pid};
+    $ENV{'IM_PATH_ANGEL_PID'}=  $instance_manager->{path_angel_pid};
+    $ENV{'IM_PORT'}=            $instance_manager->{port};
+    $ENV{'IM_DEFAULTS_PATH'}=   $instance_manager->{defaults_file};
+    $ENV{'IM_PASSWORD_PATH'}=   $instance_manager->{password_file};
+
+    $ENV{'IM_MYSQLD1_SOCK'}=
+      $instance_manager->{instances}->[0]->{path_sock};
+    $ENV{'IM_MYSQLD1_PORT'}=
+      $instance_manager->{instances}->[0]->{port};
+    $ENV{'IM_MYSQLD1_PATH_PID'}=
+      $instance_manager->{instances}->[0]->{path_pid};
+    $ENV{'IM_MYSQLD2_SOCK'}=
+      $instance_manager->{instances}->[1]->{path_sock};
+    $ENV{'IM_MYSQLD2_PORT'}=
+      $instance_manager->{instances}->[1]->{port};
+    $ENV{'IM_MYSQLD2_PATH_PID'}=
+      $instance_manager->{instances}->[1]->{path_pid};
+  }
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqlcheck
+  # ----------------------------------------------------
+  my $cmdline_mysqlcheck=
+    mtr_native_path($exe_mysqlcheck) .
+    " --no-defaults --debug-check -uroot " .
+    "--port=$master->[0]->{'port'} " .
+    "--socket=$master->[0]->{'path_sock'} --password=";
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysqlcheck .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqlcheck.trace";
+  }
+  $ENV{'MYSQL_CHECK'}=              $cmdline_mysqlcheck;
+
+  # ----------------------------------------------------
+  # Setup env to childs can execute myqldump
+  # ----------------------------------------------------
+  my $cmdline_mysqldump= generate_cmdline_mysqldump($master->[0]);
+  my $cmdline_mysqldumpslave= generate_cmdline_mysqldump($slave->[0]);
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysqldump .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace";
+    $cmdline_mysqldumpslave .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace";
+  }
+  $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump;
+  $ENV{'MYSQL_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
+
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqlslap
+  # ----------------------------------------------------
+  if ( $exe_mysqlslap )
+  {
+    my $cmdline_mysqlslap=
+      mtr_native_path($exe_mysqlslap) .
+      " -uroot " .
+      "--port=$master->[0]->{'port'} " .
+      "--socket=$master->[0]->{'path_sock'} --password= ";
+
+    if ( $opt_debug )
+   {
+      $cmdline_mysqlslap .=
+	" --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
+    }
+    $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap;
+  }
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqlimport
+  # ----------------------------------------------------
+  my $cmdline_mysqlimport=
+    mtr_native_path($exe_mysqlimport) .
+    " -uroot --debug-check " .
+    "--port=$master->[0]->{'port'} " .
+    "--socket=$master->[0]->{'path_sock'} --password=";
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysqlimport .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqlimport.trace";
+  }
+  $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport;
+
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqlshow
+  # ----------------------------------------------------
+  my $cmdline_mysqlshow=
+    mtr_native_path($exe_mysqlshow) .
+    " -uroot --debug-check " .
+    "--port=$master->[0]->{'port'} " .
+    "--socket=$master->[0]->{'path_sock'} --password=";
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysqlshow .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqlshow.trace";
+  }
+  $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow;
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqlbinlog
+  # ----------------------------------------------------
+  my $cmdline_mysqlbinlog=
+    mtr_native_path($exe_mysqlbinlog) .
+      " --no-defaults --disable-force-if-open --debug-check";
+  if ( !$opt_extern && $mysql_version_id >= 50000 )
+  {
+    $cmdline_mysqlbinlog .=" --character-sets-dir=$path_charsetsdir";
+  }
+  # Always use the given tmpdir for the LOAD files created
+  # by mysqlbinlog
+  $cmdline_mysqlbinlog .=" --local-load=$opt_tmpdir";
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysqlbinlog .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace";
+  }
+  $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog;
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysql
+  # ----------------------------------------------------
+  my $cmdline_mysql=
+    mtr_native_path($exe_mysql) .
+    " --no-defaults --debug-check --host=localhost  --user=root --password= " .
+    "--port=$master->[0]->{'port'} " .
+    "--socket=$master->[0]->{'path_sock'} ".
+    "--character-sets-dir=$path_charsetsdir";
+
+  $ENV{'MYSQL'}= $cmdline_mysql;
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute bug25714
+  # ----------------------------------------------------
+  $ENV{'MYSQL_BUG25714'}=  $exe_bug25714;
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysql_client_test
+  # ----------------------------------------------------
+  $ENV{'MYSQL_CLIENT_TEST'}=  mysql_client_test_arguments();
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysql_upgrade
+  # ----------------------------------------------------
+  if ( !$opt_extern && $mysql_version_id >= 50000 )
+  {
+    $ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments();
+  }
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysql_fix_system_tables
+  # ----------------------------------------------------
+  if ( !$opt_extern && ! $glob_win32 )
+  {
+    my $cmdline_mysql_fix_system_tables=
+      "$exe_mysql_fix_system_tables --no-defaults --host=localhost " .
+      "--user=root --password= " .
+      "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
+      "--port=$master->[0]->{'port'} " .
+      "--socket=$master->[0]->{'path_sock'}";
+    $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
+
+  }
+  $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}=  $file_mysql_fix_privilege_tables;
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute my_print_defaults
+  # ----------------------------------------------------
+  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults);
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute mysqladmin
+  # ----------------------------------------------------
+  $ENV{'MYSQLADMIN'}= mtr_native_path($exe_mysqladmin);
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute perror  
+  # ----------------------------------------------------
+  $ENV{'MY_PERROR'}= mtr_native_path($exe_perror);
+
+  # ----------------------------------------------------
+  # Add the path where mysqld will find udf_example.so
+  # ----------------------------------------------------
+  $ENV{'UDF_EXAMPLE_LIB'}=
+    ($lib_udf_example ? basename($lib_udf_example) : "");
+  $ENV{'UDF_EXAMPLE_LIB_OPT'}=
+    ($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : "");
+
+  # ----------------------------------------------------
+  # Add the path where mysqld will find ha_example.so
+  # ----------------------------------------------------
+  $ENV{'EXAMPLE_PLUGIN'}=
+    ($lib_example_plugin ? basename($lib_example_plugin) : "");
+  $ENV{'EXAMPLE_PLUGIN_OPT'}=
+    ($lib_example_plugin ? "--plugin_dir=" . dirname($lib_example_plugin) : "");
+
+  # ----------------------------------------------------
+  # Setup env so childs can execute myisampack and myisamchk
+  # ----------------------------------------------------
+  $ENV{'MYISAMCHK'}= mtr_native_path(mtr_exe_exists(
+                       vs_config_dirs('storage/myisam', 'myisamchk'),
+                       vs_config_dirs('myisam', 'myisamchk'),
+                       "$path_client_bindir/myisamchk",
+                       "$glob_basedir/storage/myisam/myisamchk",
+                       "$glob_basedir/myisam/myisamchk"));
+  $ENV{'MYISAMPACK'}= mtr_native_path(mtr_exe_exists(
+                        vs_config_dirs('storage/myisam', 'myisampack'),
+                        vs_config_dirs('myisam', 'myisampack'),
+                        "$path_client_bindir/myisampack",
+                        "$glob_basedir/storage/myisam/myisampack",
+                        "$glob_basedir/myisam/myisampack"));
+
+  # ----------------------------------------------------
+  # We are nice and report a bit about our settings
+  # ----------------------------------------------------
+  if (!$opt_extern)
+  {
+    print "Using MTR_BUILD_THREAD      = $ENV{MTR_BUILD_THREAD}\n";
+    print "Using MASTER_MYPORT         = $ENV{MASTER_MYPORT}\n";
+    print "Using MASTER_MYPORT1        = $ENV{MASTER_MYPORT1}\n";
+    print "Using SLAVE_MYPORT          = $ENV{SLAVE_MYPORT}\n";
+    print "Using SLAVE_MYPORT1         = $ENV{SLAVE_MYPORT1}\n";
+    print "Using SLAVE_MYPORT2         = $ENV{SLAVE_MYPORT2}\n";
+    if ( ! $opt_skip_ndbcluster )
+    {
+      print "Using NDBCLUSTER_PORT       = $ENV{NDBCLUSTER_PORT}\n";
+      if ( ! $opt_skip_ndbcluster_slave )
+      {
+	print "Using NDBCLUSTER_PORT_SLAVE = $ENV{NDBCLUSTER_PORT_SLAVE}\n";
+      }
+    }
+    if ( ! $opt_skip_im )
+    {
+      print "Using IM_PORT               = $ENV{IM_PORT}\n";
+      print "Using IM_MYSQLD1_PORT       = $ENV{IM_MYSQLD1_PORT}\n";
+      print "Using IM_MYSQLD2_PORT       = $ENV{IM_MYSQLD2_PORT}\n";
+    }
+  }
+
+  # Create an environment variable to make it possible
+  # to detect that valgrind is being used from test cases
+  $ENV{'VALGRIND_TEST'}= $opt_valgrind;
+
+}
+
+
+##############################################################################
+#
+#  If we get a ^C, we try to clean up before termination
+#
+##############################################################################
+# FIXME check restrictions what to do in a signal handler
+
+sub signal_setup () {
+  $SIG{INT}= \&handle_int_signal;
+}
+
+
+sub handle_int_signal () {
+  $SIG{INT}= 'DEFAULT';         # If we get a ^C again, we die...
+  mtr_warning("got INT signal, cleaning up.....");
+  stop_all_servers();
+  mtr_error("We die from ^C signal from user");
+}
+
+
+##############################################################################
+#
+#  Handle left overs from previous runs
+#
+##############################################################################
+
+sub kill_running_servers () {
+
+  if ( $opt_fast or $glob_use_embedded_server )
+  {
+    # FIXME is embedded server really using PID files?!
+    unlink($master->[0]->{'path_pid'});
+    unlink($master->[1]->{'path_pid'});
+    unlink($slave->[0]->{'path_pid'});
+    unlink($slave->[1]->{'path_pid'});
+    unlink($slave->[2]->{'path_pid'});
+  }
+  else
+  {
+    # Ensure that no old mysqld test servers are running
+    # This is different from terminating processes we have
+    # started from this run of the script, this is terminating
+    # leftovers from previous runs.
+    mtr_kill_leftovers();
+   }
+}
+
+#
+# Remove var and any directories in var/ created by previous
+# tests
+#
+sub remove_stale_vardir () {
+
+  mtr_report("Removing Stale Files");
+
+  # Safety!
+  mtr_error("No, don't remove the vardir when running with --extern")
+    if $opt_extern;
+
+  mtr_verbose("opt_vardir: $opt_vardir");
+  if ( $opt_vardir eq $default_vardir )
+  {
+    #
+    # Running with "var" in mysql-test dir
+    #
+    if ( -l $opt_vardir)
+    {
+      # var is a symlink
+
+      if ( $opt_mem and readlink($opt_vardir) eq $opt_mem )
+      {
+	# Remove the directory which the link points at
+	mtr_verbose("Removing " . readlink($opt_vardir));
+	mtr_rmtree(readlink($opt_vardir));
+
+	# Remove the "var" symlink
+	mtr_verbose("unlink($opt_vardir)");
+	unlink($opt_vardir);
+      }
+      elsif ( $opt_mem )
+      {
+	# Just remove the "var" symlink
+	mtr_report("WARNING: Removing '$opt_vardir' symlink it's wrong");
+
+	mtr_verbose("unlink($opt_vardir)");
+	unlink($opt_vardir);
+      }
+      else
+      {
+	# Some users creates a soft link in mysql-test/var to another area
+	# - allow it, but remove all files in it
+
+	mtr_report("WARNING: Using the 'mysql-test/var' symlink");
+
+	# Make sure the directory where it points exist
+	mtr_error("The destination for symlink $opt_vardir does not exist")
+	  if ! -d readlink($opt_vardir);
+
+	foreach my $bin ( glob("$opt_vardir/*") )
+	{
+	  mtr_verbose("Removing bin $bin");
+	  mtr_rmtree($bin);
+	}
+      }
+    }
+    else
+    {
+      # Remove the entire "var" dir
+      mtr_verbose("Removing $opt_vardir/");
+      mtr_rmtree("$opt_vardir/");
+    }
+
+    if ( $opt_mem )
+    {
+      # A symlink from var/ to $opt_mem will be set up
+      # remove the $opt_mem dir to assure the symlink
+      # won't point at an old directory
+      mtr_verbose("Removing $opt_mem");
+      mtr_rmtree($opt_mem);
+    }
+
+  }
+  else
+  {
+    #
+    # Running with "var" in some other place
+    #
+
+    # Remove the var/ dir in mysql-test dir if any
+    # this could be an old symlink that shouldn't be there
+    mtr_verbose("Removing $default_vardir");
+    mtr_rmtree($default_vardir);
+
+    # Remove the "var" dir
+    mtr_verbose("Removing $opt_vardir/");
+    mtr_rmtree("$opt_vardir/");
+  }
+}
+
+#
+# Create var and the directories needed in var
+#
+sub setup_vardir() {
+  mtr_report("Creating Directories");
+
+  if ( $opt_vardir eq $default_vardir )
+  {
+    #
+    # Running with "var" in mysql-test dir
+    #
+    if ( -l $opt_vardir )
+    {
+      #  it's a symlink
+
+      # Make sure the directory where it points exist
+      mtr_error("The destination for symlink $opt_vardir does not exist")
+	if ! -d readlink($opt_vardir);
+    }
+    elsif ( $opt_mem )
+    {
+      # Runinng with "var" as a link to some "memory" location, normally tmpfs
+      mtr_verbose("Creating $opt_mem");
+      mkpath($opt_mem);
+
+      mtr_report("Symlinking 'var' to '$opt_mem'");
+      symlink($opt_mem, $opt_vardir);
+    }
+  }
+
+  if ( ! -d $opt_vardir )
+  {
+    mtr_verbose("Creating $opt_vardir");
+    mkpath($opt_vardir);
+  }
+
+  # Ensure a proper error message if vardir couldn't be created
+  unless ( -d $opt_vardir and -w $opt_vardir )
+  {
+    mtr_error("Writable 'var' directory is needed, use the " .
+	      "'--vardir=<path>' option");
+  }
+
+  mkpath("$opt_vardir/log");
+  mkpath("$opt_vardir/run");
+  mkpath("$opt_vardir/tmp");
+  mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";
+
+  # Create new data dirs
+  foreach my $data_dir (@data_dir_lst)
+  {
+    mkpath("$data_dir/mysql");
+    mkpath("$data_dir/test");
+  }
+
+  # Make a link std_data_ln in var/ that points to std_data
+  if ( ! $glob_win32 )
+  {
+    symlink("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
+  }
+  else
+  {
+    # on windows, copy all files from std_data into var/std_data_ln
+    mkpath("$opt_vardir/std_data_ln");
+    mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
+  }
+
+  # Remove old log files
+  foreach my $name (glob("r/*.progress r/*.log r/*.warnings"))
+  {
+    unlink($name);
+  }
+}
+
+
+sub  check_running_as_root () {
+  # Check if running as root
+  # i.e a file can be read regardless what mode we set it to
+  my $test_file= "$opt_vardir/test_running_as_root.txt";
+  mtr_tofile($test_file, "MySQL");
+  chmod(oct("0000"), $test_file);
+
+  my $result="";
+  if (open(FILE,"<",$test_file))
+  {
+    $result= join('', <FILE>);
+    close FILE;
+  }
+
+  # Some filesystems( for example CIFS) allows reading a file
+  # although mode was set to 0000, but in that case a stat on
+  # the file will not return 0000
+  my $file_mode= (stat($test_file))[2] & 07777;
+
+  $ENV{'MYSQL_TEST_ROOT'}= "NO";
+  mtr_verbose("result: $result, file_mode: $file_mode");
+  if ($result eq "MySQL" && $file_mode == 0)
+  {
+    mtr_warning("running this script as _root_ will cause some " .
+                "tests to be skipped");
+    $ENV{'MYSQL_TEST_ROOT'}= "YES";
+  }
+
+  chmod(oct("0755"), $test_file);
+  unlink($test_file);
+
+}
+
+
+sub check_ssl_support ($) {
+  my $mysqld_variables= shift;
+
+  if ($opt_skip_ssl || $opt_extern)
+  {
+    if (!$opt_extern)
+    {
+      mtr_report("Skipping SSL");
+    }
+    $opt_ssl_supported= 0;
+    $opt_ssl= 0;
+    return;
+  }
+
+  if ( ! $mysqld_variables->{'ssl'} )
+  {
+    if ( $opt_ssl)
+    {
+      mtr_error("Couldn't find support for SSL");
+      return;
+    }
+    mtr_report("Skipping SSL, mysqld not compiled with SSL");
+    $opt_ssl_supported= 0;
+    $opt_ssl= 0;
+    return;
+  }
+  mtr_report("Setting mysqld to support SSL connections");
+  $opt_ssl_supported= 1;
+}
+
+
+sub check_debug_support ($) {
+  my $mysqld_variables= shift;
+
+  if ( ! $mysqld_variables->{'debug'} )
+  {
+    #mtr_report("Binaries are not debug compiled");
+    $debug_compiled_binaries= 0;
+
+    if ( $opt_debug )
+    {
+      mtr_error("Can't use --debug, binaries does not support it");
+    }
+    return;
+  }
+  mtr_report("Binaries are debug compiled");
+  $debug_compiled_binaries= 1;
+}
+
+##############################################################################
+#
+# Helper function to handle configuration-based subdirectories which Visual
+# Studio uses for storing binaries.  If opt_vs_config is set, this returns
+# a path based on that setting; if not, it returns paths for the default
+# /release/ and /debug/ subdirectories.
+#
+# $exe can be undefined, if the directory itself will be used
+#
+###############################################################################
+
+sub vs_config_dirs ($$) {
+  my ($path_part, $exe) = @_;
+
+  $exe = "" if not defined $exe;
+
+  if ($opt_vs_config)
+  {
+    return ("$glob_basedir/$path_part/$opt_vs_config/$exe");
+  }
+
+  return ("$glob_basedir/$path_part/release/$exe",
+          "$glob_basedir/$path_part/relwithdebinfo/$exe",
+          "$glob_basedir/$path_part/debug/$exe");
+}
+
+##############################################################################
+#
+#  Start the ndb cluster
+#
+##############################################################################
+
+sub check_ndbcluster_support ($) {
+  my $mysqld_variables= shift;
+
+  if ($opt_skip_ndbcluster || $opt_extern)
+  {
+    if (!$opt_extern)
+    {
+      mtr_report("Skipping ndbcluster");
+    }
+    $opt_skip_ndbcluster_slave= 1;
+    return;
+  }
+
+  if ( ! $mysqld_variables->{'ndb-connectstring'} )
+  {
+    mtr_report("Skipping ndbcluster, mysqld not compiled with ndbcluster");
+    $opt_skip_ndbcluster= 1;
+    $opt_skip_ndbcluster_slave= 1;
+    return;
+  }
+  $glob_ndbcluster_supported= 1;
+  mtr_report("Using ndbcluster when necessary, mysqld supports it");
+
+  if ( $mysql_version_id < 50100 )
+  {
+    # Slave cluster is not supported until 5.1
+    $opt_skip_ndbcluster_slave= 1;
+
+  }
+
+  return;
+}
+
+
+sub ndbcluster_start_install ($) {
+  my $cluster= shift;
+
+  mtr_report("Installing $cluster->{'name'} Cluster");
+
+  mkdir($cluster->{'data_dir'});
+
+  # Create a config file from template
+  my $ndb_no_ord=512;
+  my $ndb_no_attr=2048;
+  my $ndb_con_op=105000;
+  my $ndb_dmem="80M";
+  my $ndb_imem="24M";
+  my $ndb_pbmem="32M";
+  my $nodes= $cluster->{'nodes'};
+  my $ndb_host= "localhost";
+  my $ndb_diskless= 0;
+
+  if (!$opt_bench)
+  {
+    # Use a smaller configuration
+    if (  $mysql_version_id < 50100 )
+    {
+      # 4.1 and 5.0 is using a "larger" --small configuration
+      $ndb_no_ord=128;
+      $ndb_con_op=10000;
+      $ndb_dmem="40M";
+      $ndb_imem="12M";
+    }
+    else
+    {
+      $ndb_no_ord=32;
+      $ndb_con_op=10000;
+      $ndb_dmem="20M";
+      $ndb_imem="1M";
+      $ndb_pbmem="4M";
+    }
+  }
+
+  my $config_file_template=     "lib/v1/ndb_config_${nodes}_node.ini";
+  my $config_file= "$cluster->{'data_dir'}/config.ini";
+
+  open(IN, $config_file_template)
+    or mtr_error("Can't open $config_file_template: $!");
+  open(OUT, ">", $config_file)
+    or mtr_error("Can't write to $config_file: $!");
+  while (<IN>)
+  {
+    chomp;
+
+    s/CHOOSE_MaxNoOfAttributes/$ndb_no_attr/;
+    s/CHOOSE_MaxNoOfOrderedIndexes/$ndb_no_ord/;
+    s/CHOOSE_MaxNoOfConcurrentOperations/$ndb_con_op/;
+    s/CHOOSE_DataMemory/$ndb_dmem/;
+    s/CHOOSE_IndexMemory/$ndb_imem/;
+    s/CHOOSE_Diskless/$ndb_diskless/;
+    s/CHOOSE_HOSTNAME_.*/$ndb_host/;
+    s/CHOOSE_FILESYSTEM/$cluster->{'data_dir'}/;
+    s/CHOOSE_PORT_MGM/$cluster->{'port'}/;
+    if ( $mysql_version_id < 50000 )
+    {
+      my $base_port= $cluster->{'port'} + 1;
+      s/CHOOSE_PORT_TRANSPORTER/$base_port/;
+    }
+    s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/;
+
+    print OUT "$_ \n";
+  }
+  close OUT;
+  close IN;
+
+
+  # Start cluster with "--initial"
+
+  ndbcluster_start($cluster, "--initial");
+
+  return 0;
+}
+
+
+sub ndbcluster_wait_started($$){
+  my $cluster= shift;
+  my $ndb_waiter_extra_opt= shift;
+  my $path_waiter_log= "$cluster->{'data_dir'}/ndb_waiter.log";
+  my $args;
+
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--core");
+  mtr_add_arg($args, "--ndb-connectstring=%s", $cluster->{'connect_string'});
+  mtr_add_arg($args, "--timeout=60");
+
+  if ($ndb_waiter_extra_opt)
+  {
+    mtr_add_arg($args, "$ndb_waiter_extra_opt");
+  }
+
+  # Start the ndb_waiter which will connect to the ndb_mgmd
+  # and poll it for state of the ndbd's, will return when
+  # all nodes in the cluster is started
+  my $res= mtr_run($exe_ndb_waiter, $args,
+		   "", $path_waiter_log, $path_waiter_log, "");
+  mtr_verbose("ndbcluster_wait_started, returns: $res") if $res;
+  return $res;
+}
+
+
+
+sub mysqld_wait_started($){
+  my $mysqld= shift;
+
+  if (sleep_until_file_created($mysqld->{'path_pid'},
+			       $mysqld->{'start_timeout'},
+			       $mysqld->{'pid'}) == 0)
+  {
+    # Failed to wait for pid file
+    return 1;
+  }
+
+  # Get the "real pid" of the process, it will be used for killing
+  # the process in ActiveState's perl on windows
+  $mysqld->{'real_pid'}= mtr_get_pid_from_file($mysqld->{'path_pid'});
+
+  return 0;
+}
+
+
+sub ndb_mgmd_wait_started($) {
+  my ($cluster)= @_;
+
+  my $retries= 100;
+  while (ndbcluster_wait_started($cluster, "--no-contact") and
+	 $retries)
+  {
+    # Millisceond sleep emulated with select
+    select(undef, undef, undef, (0.1));
+
+    $retries--;
+  }
+
+  return $retries == 0;
+
+}
+
+sub ndb_mgmd_start ($) {
+  my $cluster= shift;
+
+  my $args;                             # Arg vector
+  my $pid= -1;
+
+  mtr_init_args(\$args);
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--core");
+  mtr_add_arg($args, "--nodaemon");
+  mtr_add_arg($args, "--config-file=%s", "$cluster->{'data_dir'}/config.ini");
+
+
+  my $path_ndb_mgmd_log= "$cluster->{'data_dir'}/\l$cluster->{'name'}_ndb_mgmd.log";
+  $pid= mtr_spawn($exe_ndb_mgmd, $args, "",
+		  $path_ndb_mgmd_log,
+		  $path_ndb_mgmd_log,
+		  "",
+		  { append_log_file => 1 });
+
+  # FIXME Should not be needed
+  # Unfortunately the cluster nodes will fail to start
+  # if ndb_mgmd has not started properly
+  if (ndb_mgmd_wait_started($cluster))
+  {
+    mtr_error("Failed to wait for start of ndb_mgmd");
+  }
+
+  # Remember pid of ndb_mgmd
+  $cluster->{'pid'}= $pid;
+
+  mtr_verbose("ndb_mgmd_start, pid: $pid");
+
+  return $pid;
+}
+
+
+sub ndbd_start ($$$) {
+  my $cluster= shift;
+  my $idx= shift;
+  my $extra_args= shift;
+
+  my $args;                             # Arg vector
+  my $pid= -1;
+
+  mtr_init_args(\$args);
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--core");
+  mtr_add_arg($args, "--ndb-connectstring=%s", "$cluster->{'connect_string'}");
+  if ( $mysql_version_id >= 50000)
+  {
+    mtr_add_arg($args, "--character-sets-dir=%s", "$path_charsetsdir");
+  }
+  mtr_add_arg($args, "--nodaemon");
+  mtr_add_arg($args, "$extra_args");
+
+  my $nodeid= $cluster->{'ndbds'}->[$idx]->{'nodeid'};
+  my $path_ndbd_log= "$cluster->{'data_dir'}/ndb_${nodeid}.log";
+  $pid= mtr_spawn($exe_ndbd, $args, "",
+		  $path_ndbd_log,
+		  $path_ndbd_log,
+		  "",
+		  { append_log_file => 1 });
+
+  # Add pid to list of pids for this cluster
+  $cluster->{'ndbds'}->[$idx]->{'pid'}= $pid;
+
+  # Rememeber options used when starting
+  $cluster->{'ndbds'}->[$idx]->{'start_extra_args'}= $extra_args;
+  $cluster->{'ndbds'}->[$idx]->{'idx'}= $idx;
+
+  mtr_verbose("ndbd_start, pid: $pid");
+
+  return $pid;
+}
+
+
+sub ndbcluster_start ($$) {
+  my $cluster= shift;
+  my $extra_args= shift;
+
+  mtr_verbose("ndbcluster_start '$cluster->{'name'}'");
+
+  if ( $cluster->{'use_running'} )
+  {
+    return 0;
+  }
+
+  if ( $cluster->{'pid'} )
+  {
+    mtr_error("Cluster '$cluster->{'name'}' already started");
+  }
+
+  ndb_mgmd_start($cluster);
+
+  for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ )
+  {
+    ndbd_start($cluster, $idx, $extra_args);
+  }
+
+  return 0;
+}
+
+
+sub rm_ndbcluster_tables ($) {
+  my $dir=       shift;
+  foreach my $bin ( glob("$dir/mysql/ndb_apply_status*"),
+                    glob("$dir/mysql/ndb_schema*"))
+  {
+    unlink($bin);
+  }
+}
+
+
+##############################################################################
+#
+#  Run the benchmark suite
+#
+##############################################################################
+
+sub run_benchmarks ($) {
+  my $benchmark=  shift;
+
+  my $args;
+
+  if ( ! $glob_use_embedded_server )
+  {
+    mysqld_start($master->[0],[],[]);
+    if ( ! $master->[0]->{'pid'} )
+    {
+      mtr_error("Can't start the mysqld server");
+    }
+  }
+
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
+  mtr_add_arg($args, "--user=%s", $opt_user);
+
+  if ( $opt_small_bench )
+  {
+    mtr_add_arg($args, "--small-test");
+    mtr_add_arg($args, "--small-tables");
+  }
+
+  if ( $opt_with_ndbcluster )
+  {
+    mtr_add_arg($args, "--create-options=TYPE=ndb");
+  }
+
+  chdir($glob_mysql_bench_dir)
+    or mtr_error("Couldn't chdir to '$glob_mysql_bench_dir': $!");
+
+  if ( ! $benchmark )
+  {
+    mtr_add_arg($args, "--log");
+    mtr_run("$glob_mysql_bench_dir/run-all-tests", $args, "", "", "", "");
+    # FIXME check result code?!
+  }
+  elsif ( -x $benchmark )
+  {
+    mtr_run("$glob_mysql_bench_dir/$benchmark", $args, "", "", "", "");
+    # FIXME check result code?!
+  }
+  else
+  {
+    mtr_error("Benchmark $benchmark not found");
+  }
+
+  chdir($glob_mysql_test_dir);          # Go back
+
+  if ( ! $glob_use_embedded_server )
+  {
+    stop_masters();
+  }
+}
+
+
+##############################################################################
+#
+#  Run the tests
+#
+##############################################################################
+
+sub run_tests () {
+  my ($tests)= @_;
+
+  mtr_print_thick_line();
+
+  mtr_timer_start($glob_timers,"suite", 60 * $opt_suite_timeout);
+
+  mtr_report_tests_not_skipped_though_disabled($tests);
+
+  mtr_print_header();
+
+  foreach my $tinfo ( @$tests )
+  {
+    if (run_testcase_check_skip_test($tinfo))
+    {
+      next;
+    }
+
+    mtr_timer_start($glob_timers,"testcase", 60 * $opt_testcase_timeout);
+    run_testcase($tinfo);
+    mtr_timer_stop($glob_timers,"testcase");
+  }
+
+  mtr_print_line();
+
+  if ( ! $glob_debugger and
+       ! $opt_extern and
+       ! $glob_use_embedded_server )
+  {
+    stop_all_servers();
+  }
+
+  if ( $opt_gcov )
+  {
+    gcov_collect(); # collect coverage information
+  }
+  if ( $opt_gprof )
+  {
+    gprof_collect(); # collect coverage information
+  }
+
+  mtr_report_stats($tests);
+
+  mtr_timer_stop($glob_timers,"suite");
+}
+
+
+##############################################################################
+#
+#  Initiate the test databases
+#
+##############################################################################
+
+sub initialize_servers () {
+
+  datadir_list_setup();
+
+  if ( $opt_extern )
+  {
+    # Running against an already started server, if the specified
+    # vardir does not already exist it should be created
+    if ( ! -d $opt_vardir )
+    {
+      mtr_report("Creating '$opt_vardir'");
+      setup_vardir();
+    }
+    else
+    {
+      mtr_verbose("No need to create '$opt_vardir' it already exists");
+    }
+  }
+  else
+  {
+    kill_running_servers();
+
+    if ( ! $opt_start_dirty )
+    {
+      remove_stale_vardir();
+      setup_vardir();
+
+      mysql_install_db();
+      if ( $opt_force )
+      {
+	# Save a snapshot of the freshly installed db
+	# to make it possible to restore to a known point in time
+	save_installed_db();
+      }
+    }
+  }
+  check_running_as_root();
+
+  mtr_log_init("$opt_vardir/log/mysql-test-run.log");
+
+}
+
+sub mysql_install_db () {
+
+  install_db('master', $master->[0]->{'path_myddir'});
+
+  if ($max_master_num > 1)
+  {
+    copy_install_db('master', $master->[1]->{'path_myddir'});
+  }
+
+  # Install the number of slave databses needed
+  for (my $idx= 0; $idx < $max_slave_num; $idx++)
+  {
+    copy_install_db("slave".($idx+1), $slave->[$idx]->{'path_myddir'});
+  }
+
+  if ( ! $opt_skip_im )
+  {
+    im_prepare_env($instance_manager);
+  }
+
+  my $cluster_started_ok= 1; # Assume it can be started
+
+  my $cluster= $clusters->[0]; # Master cluster
+  if ($opt_skip_ndbcluster ||
+      $cluster->{'use_running'} ||
+      $cluster->{executable_setup_failed})
+  {
+    # Don't install master cluster
+  }
+  elsif (ndbcluster_start_install($cluster))
+  {
+    mtr_warning("Failed to start install of $cluster->{name}");
+    $cluster_started_ok= 0;
+  }
+
+  $cluster= $clusters->[1]; # Slave cluster
+  if ($max_slave_num == 0 ||
+      $opt_skip_ndbcluster_slave ||
+      $cluster->{'use_running'} ||
+      $cluster->{executable_setup_failed})
+  {
+    # Don't install slave cluster
+  }
+  elsif (ndbcluster_start_install($cluster))
+  {
+    mtr_warning("Failed to start install of $cluster->{name}");
+    $cluster_started_ok= 0;
+  }
+
+  foreach $cluster (@{$clusters})
+  {
+
+    next if !$cluster->{'pid'};
+
+    $cluster->{'installed_ok'}= 1; # Assume install suceeds
+
+    if (ndbcluster_wait_started($cluster, ""))
+    {
+      # failed to install, disable usage and flag that its no ok
+      mtr_report("ndbcluster_install of $cluster->{'name'} failed");
+      $cluster->{"installed_ok"}= 0;
+
+      $cluster_started_ok= 0;
+    }
+  }
+
+  if ( ! $cluster_started_ok )
+  {
+    if ( $opt_force)
+    {
+      # Continue without cluster
+    }
+    else
+    {
+      mtr_error("To continue, re-run with '--force'.");
+    }
+  }
+
+  return 0;
+}
+
+
+sub copy_install_db ($$) {
+  my $type=      shift;
+  my $data_dir=  shift;
+
+  mtr_report("Installing \u$type Database");
+
+  # Just copy the installed db from first master
+  mtr_copy_dir($master->[0]->{'path_myddir'}, $data_dir);
+
+}
+
+
+sub install_db ($$) {
+  my $type=      shift;
+  my $data_dir=  shift;
+
+  mtr_report("Installing \u$type Database");
+
+
+  my $args;
+  mtr_init_args(\$args);
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--bootstrap");
+  mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
+  mtr_add_arg($args, "--datadir=%s", $data_dir);
+  mtr_add_arg($args, "--loose-skip-innodb");
+  mtr_add_arg($args, "--loose-skip-ndbcluster");
+  mtr_add_arg($args, "--tmpdir=.");
+  mtr_add_arg($args, "--core-file");
+
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap_%s.trace",
+		$path_vardir_trace, $type);
+  }
+
+  if ( ! $glob_netware )
+  {
+    mtr_add_arg($args, "--language=%s", $path_language);
+    mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
+  }
+
+  # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g.,
+  # configure --disable-grant-options), mysqld will not recognize the
+  # --bootstrap or --skip-grant-tables options.  The user can set
+  # MYSQLD_BOOTSTRAP to the full path to a mysqld which does accept
+  # --bootstrap, to accommodate this.
+  my $exe_mysqld_bootstrap = $ENV{'MYSQLD_BOOTSTRAP'} || $exe_mysqld;
+
+  # ----------------------------------------------------------------------
+  # export MYSQLD_BOOTSTRAP_CMD variable containing <path>/mysqld <args>
+  # ----------------------------------------------------------------------
+  $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args);
+
+  # ----------------------------------------------------------------------
+  # Create the bootstrap.sql file
+  # ----------------------------------------------------------------------
+  my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
+
+  # Use the mysql database for system tables
+  mtr_tofile($bootstrap_sql_file, "use mysql");
+
+  # Add the offical mysql system tables
+  # for a production system
+  mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql",
+			 $bootstrap_sql_file);
+
+  # Add the mysql system tables initial data
+  # for a production system
+  mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql",
+			 $bootstrap_sql_file);
+
+  # Add test data for timezone - this is just a subset, on a real
+  # system these tables will be populated either by mysql_tzinfo_to_sql
+  # or by downloading the timezone table package from our website
+  mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql",
+			 $bootstrap_sql_file);
+
+  # Fill help tables, just an empty file when running from bk repo
+  # but will be replaced by a real fill_help_tables.sql when
+  # building the source dist
+  mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql",
+			 $bootstrap_sql_file);
+
+  # Remove anonymous users
+  mtr_tofile($bootstrap_sql_file,
+	     "DELETE FROM mysql.user where user= '';");
+
+  # Log bootstrap command
+  my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
+  mtr_tofile($path_bootstrap_log,
+	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");
+
+
+  if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file,
+               $path_bootstrap_log, $path_bootstrap_log,
+	       "", { append_log_file => 1 }) != 0 )
+
+  {
+    mtr_error("Error executing mysqld --bootstrap\n" .
+              "Could not install system database from $bootstrap_sql_file\n" .
+	      "see $path_bootstrap_log for errors");
+  }
+}
+
+
+sub im_prepare_env($) {
+  my $instance_manager = shift;
+
+  im_create_passwd_file($instance_manager);
+  im_prepare_data_dir($instance_manager);
+}
+
+
+sub im_create_passwd_file($) {
+  my $instance_manager = shift;
+
+  my $pwd_file_path = $instance_manager->{'password_file'};
+
+  mtr_report("Creating IM password file ($pwd_file_path)");
+
+  open(OUT, ">", $pwd_file_path)
+    or mtr_error("Can't write to $pwd_file_path: $!");
+
+  print OUT $instance_manager->{'admin_login'}, ":",
+        $instance_manager->{'admin_sha1'}, "\n";
+
+  close(OUT);
+}
+
+
+sub im_create_defaults_file($) {
+  my $instance_manager = shift;
+
+  my $defaults_file = $instance_manager->{'defaults_file'};
+
+  open(OUT, ">", $defaults_file)
+    or mtr_error("Can't write to $defaults_file: $!");
+
+  print OUT <<EOF
+[mysql]
+
+[manager]
+pid-file            = $instance_manager->{path_pid}
+angel-pid-file      = $instance_manager->{path_angel_pid}
+socket              = $instance_manager->{path_sock}
+port                = $instance_manager->{port}
+password-file       = $instance_manager->{password_file}
+default-mysqld-path = $exe_mysqld
+
+EOF
+;
+
+  foreach my $instance (@{$instance_manager->{'instances'}})
+  {
+    my $server_id = $instance->{'server_id'};
+
+    print OUT <<EOF
+[mysqld$server_id]
+socket              = $instance->{path_sock}
+pid-file            = $instance->{path_pid}
+port                = $instance->{port}
+datadir             = $instance->{path_datadir}
+log                 = $instance->{path_datadir}/mysqld$server_id.log
+log-error           = $instance->{path_datadir}/mysqld$server_id.err.log
+log-slow-queries    = $instance->{path_datadir}/mysqld$server_id.slow.log
+language            = $path_language
+character-sets-dir  = $path_charsetsdir
+basedir             = $path_my_basedir
+server_id           = $server_id
+shutdown-delay      = 10
+skip-stack-trace
+loose-skip-innodb
+loose-skip-ndbcluster
+EOF
+;
+    if ( $mysql_version_id < 50100 )
+    {
+      print OUT "skip-bdb\n";
+    }
+    print OUT "nonguarded\n" if $instance->{'nonguarded'};
+    if ( $mysql_version_id >= 50100 )
+    {
+      print OUT "log-output=FILE\n" if $instance->{'old_log_format'};
+    }
+    print OUT "\n";
+  }
+
+  close(OUT);
+}
+
+
+sub im_prepare_data_dir($) {
+  my $instance_manager = shift;
+
+  foreach my $instance (@{$instance_manager->{'instances'}})
+  {
+    copy_install_db(
+      'im_mysqld_' . $instance->{'server_id'},
+      $instance->{'path_datadir'});
+  }
+}
+
+
+
+#
+# Restore snapshot of the installed slave databases
+# if the snapshot exists
+#
+sub restore_slave_databases ($) {
+  my ($num_slaves)= @_;
+
+  if ( -d $path_snapshot)
+  {
+    for (my $idx= 0; $idx < $num_slaves; $idx++)
+    {
+      my $data_dir= $slave->[$idx]->{'path_myddir'};
+      my $name= basename($data_dir);
+      mtr_rmtree($data_dir);
+      mtr_copy_dir("$path_snapshot/$name", $data_dir);
+    }
+  }
+}
+
+
+sub run_testcase_check_skip_test($)
+{
+  my ($tinfo)= @_;
+
+  # ----------------------------------------------------------------------
+  # If marked to skip, just print out and return.
+  # Note that a test case not marked as 'skip' can still be
+  # skipped later, because of the test case itself in cooperation
+  # with the mysqltest program tells us so.
+  # ----------------------------------------------------------------------
+
+  if ( $tinfo->{'skip'} )
+  {
+    mtr_report_test_name($tinfo);
+    mtr_report_test_skipped($tinfo);
+    return 1;
+  }
+
+  if ($tinfo->{'ndb_test'})
+  {
+    foreach my $cluster (@{$clusters})
+    {
+      # Slave cluster is skipped and thus not
+      # installed, no need to perform checks
+      last if ($opt_skip_ndbcluster_slave and
+	       $cluster->{'name'} eq 'Slave');
+
+      # Using running cluster - no need
+      # to check if test should be skipped
+      # will be done by test itself
+      last if ($cluster->{'use_running'});
+
+      # If test needs this cluster, check binaries was found ok
+      if ( $cluster->{'executable_setup_failed'} )
+      {
+	mtr_report_test_name($tinfo);
+	$tinfo->{comment}=
+	  "Failed to find cluster binaries";
+	mtr_report_test_failed($tinfo);
+	return 1;
+      }
+
+      # If test needs this cluster, check it was installed ok
+      if ( !$cluster->{'installed_ok'} )
+      {
+	mtr_report_test_name($tinfo);
+	$tinfo->{comment}=
+	  "Cluster $cluster->{'name'} was not installed ok";
+	mtr_report_test_failed($tinfo);
+	return 1;
+      }
+
+    }
+  }
+
+  if ( $tinfo->{'component_id'} eq 'im' )
+  {
+      # If test needs im, check binaries was found ok
+    if ( $instance_manager->{'executable_setup_failed'} )
+    {
+      mtr_report_test_name($tinfo);
+      $tinfo->{comment}=
+	"Failed to find MySQL manager binaries";
+      mtr_report_test_failed($tinfo);
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+
+sub do_before_run_mysqltest($)
+{
+  my $tinfo= shift;
+  my $args;
+
+  # Remove old files produced by mysqltest
+  my $base_file= mtr_match_extension($tinfo->{'result_file'},
+				    "result"); # Trim extension
+  unlink("$base_file.reject");
+  unlink("$base_file.progress");
+  unlink("$base_file.log");
+  unlink("$base_file.warnings");
+
+  if (!$opt_extern)
+  {
+    if ( $mysql_version_id < 50000 ) {
+      # Set environment variable NDB_STATUS_OK to 1
+      # if script decided to run mysqltest cluster _is_ installed ok
+      $ENV{'NDB_STATUS_OK'} = "1";
+    } elsif ( $mysql_version_id < 50100 ) {
+      # Set environment variable NDB_STATUS_OK to YES
+      # if script decided to run mysqltest cluster _is_ installed ok
+      $ENV{'NDB_STATUS_OK'} = "YES";
+    }
+    if (defined $tinfo->{binlog_format} and  $mysql_version_id > 50100 )
+    {
+      # Dynamically switch binlog format of
+      # master, slave is always restarted
+      foreach my $server ( @$master )
+      {
+        next unless ($server->{'pid'});
+
+	mtr_init_args(\$args);
+	mtr_add_arg($args, "--no-defaults");
+	mtr_add_arg($args, "--user=root");
+	mtr_add_arg($args, "--port=$server->{'port'}");
+	mtr_add_arg($args, "--socket=$server->{'path_sock'}");
+
+	my $sql= "include/set_binlog_format_".$tinfo->{binlog_format}.".sql";
+	mtr_verbose("Setting binlog format:", $tinfo->{binlog_format});
+	if (mtr_run($exe_mysql, $args, $sql, "", "", "") != 0)
+	{
+	  mtr_error("Failed to switch binlog format");
+	}
+      }
+    }
+  }
+}
+
+sub do_after_run_mysqltest($)
+{
+  my $tinfo= shift;
+
+  # Save info from this testcase run to mysqltest.log
+  mtr_appendfile_to_file($path_current_test_log, $path_mysqltest_log)
+    if -f $path_current_test_log;
+  mtr_appendfile_to_file($path_timefile, $path_mysqltest_log)
+    if -f $path_timefile;
+}
+
+
+sub run_testcase_mark_logs($$)
+{
+  my ($tinfo, $log_msg)= @_;
+
+  # Write a marker to all log files
+
+  # The file indicating current test name
+  mtr_tonewfile($path_current_test_log, $log_msg);
+
+  # each mysqld's .err file
+  foreach my $mysqld (@{$master}, @{$slave})
+  {
+    mtr_tofile($mysqld->{path_myerr}, $log_msg);
+  }
+
+  if ( $tinfo->{'component_id'} eq 'im')
+  {
+    mtr_tofile($instance_manager->{path_err}, $log_msg);
+    mtr_tofile($instance_manager->{path_log}, $log_msg);
+  }
+
+  # ndbcluster log file
+  mtr_tofile($path_ndb_testrun_log, $log_msg);
+
+}
+
+sub find_testcase_skipped_reason($)
+{
+  my ($tinfo)= @_;
+
+  # Set default message
+  $tinfo->{'comment'}= "Detected by testcase(no log file)";
+
+  # Open mysqltest-time(the mysqltest log file)
+  my $F= IO::File->new($path_timefile)
+    or return;
+  my $reason;
+
+  while ( my $line= <$F> )
+  {
+    # Look for "reason: <reason for skipping test>"
+    if ( $line =~ /reason: (.*)/ )
+    {
+      $reason= $1;
+    }
+  }
+
+  if ( ! $reason )
+  {
+    mtr_warning("Could not find reason for skipping test in $path_timefile");
+    $reason= "Detected by testcase(reason unknown) ";
+  }
+  $tinfo->{'comment'}= $reason;
+}
+
+
+##############################################################################
+#
+#  Run a single test case
+#
+##############################################################################
+
+# When we get here, we have already filtered out test cases that doesn't
+# apply to the current setup, for example if we use a running server, test
+# cases that restart the server are dropped. So this function should mostly
+# be about doing things, not a lot of logic.
+
+# We don't start and kill the servers for each testcase. But some
+# testcases needs a restart, because they specify options to start
+# mysqld with. After that testcase, we need to restart again, to set
+# back the normal options.
+
+sub run_testcase ($) {
+  my $tinfo=  shift;
+
+  # -------------------------------------------------------
+  # Init variables that can change between each test case
+  # -------------------------------------------------------
+
+  $ENV{'TZ'}= $tinfo->{'timezone'};
+  mtr_verbose("Setting timezone: $tinfo->{'timezone'}");
+
+  my $master_restart= run_testcase_need_master_restart($tinfo);
+  my $slave_restart= run_testcase_need_slave_restart($tinfo);
+
+  if ($master_restart or $slave_restart)
+  {
+    # Can't restart a running server that may be in use
+    if ( $opt_extern )
+    {
+      mtr_report_test_name($tinfo);
+      $tinfo->{comment}= "Can't restart a running server";
+      mtr_report_test_skipped($tinfo);
+      return;
+    }
+
+    run_testcase_stop_servers($tinfo, $master_restart, $slave_restart);
+  }
+
+  # Write to all log files to indicate start of testcase
+  run_testcase_mark_logs($tinfo, "CURRENT_TEST: $tinfo->{name}\n");
+
+  my $died= mtr_record_dead_children();
+  if ($died or $master_restart or $slave_restart)
+  {
+    if (run_testcase_start_servers($tinfo))
+    {
+      mtr_report_test_name($tinfo);
+      report_failure_and_restart($tinfo);
+      return 1;
+    }
+  }
+  elsif ($glob_use_embedded_server)
+  {
+    run_master_init_script($tinfo);
+  }
+
+  # ----------------------------------------------------------------------
+  # If --start-and-exit or --start-dirty given, stop here to let user manually
+  # run tests
+  # ----------------------------------------------------------------------
+  if ( $opt_start_and_exit or $opt_start_dirty )
+  {
+    mtr_timer_stop_all($glob_timers);
+    mtr_report("\nServers started, exiting");
+    if ($glob_win32_perl)
+    {
+      #ActiveState perl hangs  when using normal exit, use  POSIX::_exit instead
+      use POSIX qw[ _exit ]; 
+      POSIX::_exit(0);
+    }
+    else
+    {
+      exit(0);
+    }
+  }
+
+  {
+    do_before_run_mysqltest($tinfo);
+
+    my $res= run_mysqltest($tinfo);
+    mtr_report_test_name($tinfo);
+
+    do_after_run_mysqltest($tinfo);
+
+    if ( $res == 0 )
+    {
+      mtr_report_test_passed($tinfo);
+    }
+    elsif ( $res == 62 )
+    {
+      # Testcase itself tell us to skip this one
+
+      # Try to get reason from mysqltest.log
+      find_testcase_skipped_reason($tinfo);
+      mtr_report_test_skipped($tinfo);
+    }
+    elsif ( $res == 63 )
+    {
+      $tinfo->{'timeout'}= 1;           # Mark as timeout
+      report_failure_and_restart($tinfo);
+    }
+    elsif ( $res == 1 )
+    {
+      # Test case failure reported by mysqltest
+      report_failure_and_restart($tinfo);
+    }
+    else
+    {
+      # mysqltest failed, probably crashed
+      $tinfo->{comment}=
+	"mysqltest returned unexpected code $res, it has probably crashed";
+      report_failure_and_restart($tinfo);
+    }
+  }
+
+  # Remove the file that mysqltest writes info to
+  unlink($path_timefile);
+
+  # ----------------------------------------------------------------------
+  # Stop Instance Manager if we are processing an IM-test case.
+  # ----------------------------------------------------------------------
+  if ( $tinfo->{'component_id'} eq 'im' and
+       !mtr_im_stop($instance_manager, $tinfo->{'name'}))
+  {
+    mtr_error("Failed to stop Instance Manager.")
+  }
+}
+
+
+#
+# Save a snapshot of the installed test db(s)
+# I.e take a snapshot of the var/ dir
+#
+sub save_installed_db () {
+
+  mtr_report("Saving snapshot of installed databases");
+  mtr_rmtree($path_snapshot);
+
+  foreach my $data_dir (@data_dir_lst)
+  {
+    my $name= basename($data_dir);
+    mtr_copy_dir("$data_dir", "$path_snapshot/$name");
+  }
+}
+
+
+#
+# Save any interesting files in the data_dir
+# before the data dir is removed.
+#
+sub save_files_before_restore($$) {
+  my $test_name= shift;
+  my $data_dir= shift;
+  my $save_name= "$opt_vardir/log/$test_name";
+
+  # Look for core files
+  foreach my $core_file ( glob("$data_dir/core*") )
+  {
+    last if $opt_max_save_core > 0 && $num_saved_cores >= $opt_max_save_core;
+    my $core_name= basename($core_file);
+    mtr_report("Saving $core_name");
+    mkdir($save_name) if ! -d $save_name;
+    rename("$core_file", "$save_name/$core_name");
+    ++$num_saved_cores;
+  }
+}
+
+
+#
+# Restore snapshot of the installed test db(s)
+# if the snapshot exists
+#
+sub restore_installed_db ($) {
+  my $test_name= shift;
+
+  if ( -d $path_snapshot)
+  {
+    mtr_report("Restoring snapshot of databases");
+
+    foreach my $data_dir (@data_dir_lst)
+    {
+      my $name= basename($data_dir);
+      save_files_before_restore($test_name, $data_dir);
+      mtr_rmtree("$data_dir");
+      mtr_copy_dir("$path_snapshot/$name", "$data_dir");
+    }
+
+    # Remove the ndb_*_fs dirs for all ndbd nodes
+    # forcing a clean start of ndb
+    foreach my $cluster (@{$clusters})
+    {
+      foreach my $ndbd (@{$cluster->{'ndbds'}})
+      {
+	mtr_rmtree("$ndbd->{'path_fs'}" );
+      }
+    }
+  }
+  else
+  {
+    # No snapshot existed
+    mtr_error("No snapshot existed");
+  }
+}
+
+sub report_failure_and_restart ($) {
+  my $tinfo= shift;
+
+  mtr_report_test_failed($tinfo);
+  print "\n";
+  if ( $opt_force )
+  {
+    # Stop all servers that are known to be running
+    stop_all_servers();
+
+    # Restore the snapshot of the installed test db
+    restore_installed_db($tinfo->{'name'});
+    mtr_report("Resuming Tests\n");
+    return;
+  }
+
+  my $test_mode= join(" ", @::glob_test_mode) || "default";
+  mtr_report("Aborting: $tinfo->{'name'} failed in $test_mode mode. ");
+  mtr_report("To continue, re-run with '--force'.");
+  if ( ! $glob_debugger and
+       ! $opt_extern and
+       ! $glob_use_embedded_server )
+  {
+    stop_all_servers();
+  }
+  mtr_exit(1);
+
+}
+
+
+sub run_master_init_script ($) {
+  my ($tinfo)= @_;
+  my $init_script= $tinfo->{'master_sh'};
+
+  # Run master initialization shell script if one exists
+  if ( $init_script )
+  {
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+      # mtr_warning("$init_script exited with code $ret");
+    }
+  }
+}
+
+
+##############################################################################
+#
+#  Start and stop servers
+#
+##############################################################################
+
+
+sub do_before_start_master ($) {
+  my ($tinfo)= @_;
+
+  my $tname= $tinfo->{'name'};
+
+  # FIXME what about second master.....
+
+  # Don't delete anything if starting dirty
+  return if ($opt_start_dirty);
+
+  foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
+  {
+    unlink($bin);
+  }
+
+  # FIXME only remove the ones that are tied to this master
+  # Remove old master.info and relay-log.info files
+  unlink("$master->[0]->{'path_myddir'}/master.info");
+  unlink("$master->[0]->{'path_myddir'}/relay-log.info");
+  unlink("$master->[1]->{'path_myddir'}/master.info");
+  unlink("$master->[1]->{'path_myddir'}/relay-log.info");
+
+  run_master_init_script($tinfo);
+}
+
+
+sub do_before_start_slave ($) {
+  my ($tinfo)= @_;
+
+  my $tname= $tinfo->{'name'};
+  my $init_script= $tinfo->{'master_sh'};
+
+  # Don't delete anything if starting dirty
+  return if ($opt_start_dirty);
+
+  foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
+  {
+    unlink($bin);
+  }
+
+  unlink("$slave->[0]->{'path_myddir'}/master.info");
+  unlink("$slave->[0]->{'path_myddir'}/relay-log.info");
+
+  # Run slave initialization shell script if one exists
+  if ( $init_script )
+  {
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+      # mtr_warning("$init_script exited with code $ret");
+    }
+  }
+
+  foreach my $bin ( glob("$slave->[0]->{'path_myddir'}/log.*") )
+  {
+    unlink($bin);
+  }
+}
+
+
+sub mysqld_arguments ($$$$) {
+  my $args=              shift;
+  my $mysqld=            shift;
+  my $extra_opt=         shift;
+  my $slave_master_info= shift;
+
+  my $idx= $mysqld->{'idx'};
+  my $sidx= "";                 # Index as string, 0 is empty string
+  if ( $idx> 0 )
+  {
+    $sidx= $idx;
+  }
+
+  my $prefix= "";               # If mysqltest server arg
+  if ( $glob_use_embedded_server )
+  {
+    $prefix= "--server-arg=";
+  }
+
+  mtr_add_arg($args, "%s--no-defaults", $prefix);
+
+  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);
+  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
+
+  if ( $mysql_version_id >= 50036)
+  {
+    # By default, prevent the started mysqld to access files outside of vardir
+    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
+  }
+
+  if ( $mysql_version_id >= 50000 )
+  {
+    mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
+  }
+
+  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
+  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
+  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
+
+  # Increase default connect_timeout to avoid intermittent
+  # disconnects when test servers are put under load
+  # see BUG#28359
+  mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
+
+
+  # When mysqld is run by a root user(euid is 0), it will fail
+  # to start unless we specify what user to run as, see BUG#30630
+  my $euid= $>;
+  if (!$glob_win32 and $euid == 0 and
+      grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
+    mtr_add_arg($args, "%s--user=root", $prefix);
+  }
+
+  if ( $opt_valgrind_mysqld )
+  {
+    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
+
+    if ( $mysql_version_id < 50100 )
+    {
+      mtr_add_arg($args, "%s--skip-bdb", $prefix);
+    }
+  }
+
+  mtr_add_arg($args, "%s--pid-file=%s", $prefix,
+	      $mysqld->{'path_pid'});
+
+  mtr_add_arg($args, "%s--port=%d", $prefix,
+                $mysqld->{'port'});
+
+  mtr_add_arg($args, "%s--socket=%s", $prefix,
+	      $mysqld->{'path_sock'});
+
+  mtr_add_arg($args, "%s--datadir=%s", $prefix,
+	      $mysqld->{'path_myddir'});
+
+
+  if ( $mysql_version_id >= 50106 )
+  {
+    # Turn on logging to bothe tables and file
+    mtr_add_arg($args, "%s--log-output=table,file", $prefix);
+  }
+
+  my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
+  mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path);
+  mtr_add_arg($args,
+	      "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
+
+  # Check if "extra_opt" contains --skip-log-bin
+  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
+  if ( $mysqld->{'type'} eq 'master' )
+  {
+    if (! ($opt_skip_master_binlog || $skip_binlog) )
+    {
+      mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
+                  $opt_vardir, $sidx);
+    }
+
+    mtr_add_arg($args, "%s--server-id=%d", $prefix,
+	       $idx > 0 ? $idx + 101 : 1);
+
+    mtr_add_arg($args, "%s--loose-innodb_data_file_path=ibdata1:10M:autoextend",
+		$prefix);
+
+    mtr_add_arg($args, "%s--local-infile", $prefix);
+
+    if ( $idx > 0 or !$use_innodb)
+    {
+      mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
+    }
+
+    my $cluster= $clusters->[$mysqld->{'cluster'}];
+    if ( $cluster->{'pid'} ||           # Cluster is started
+	 $cluster->{'use_running'} )    # Using running cluster
+    {
+      mtr_add_arg($args, "%s--ndbcluster", $prefix);
+      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
+		  $cluster->{'connect_string'});
+      if ( $mysql_version_id >= 50100 )
+      {
+	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
+      }
+    }
+    else
+    {
+      mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
+    }
+  }
+  else
+  {
+    mtr_error("unknown mysqld type")
+      unless $mysqld->{'type'} eq 'slave';
+
+    mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
+    if (! ( $opt_skip_slave_binlog || $skip_binlog ))
+    {
+      mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
+                  $opt_vardir, $sidx); # FIXME use own dir for binlogs
+      mtr_add_arg($args, "%s--log-slave-updates", $prefix);
+    }
+
+    mtr_add_arg($args, "%s--master-retry-count=10", $prefix);
+
+    mtr_add_arg($args, "%s--relay-log=%s/log/slave%s-relay-bin", $prefix,
+                $opt_vardir, $sidx);
+    mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix);
+    mtr_add_arg($args, "%s--report-port=%d", $prefix,
+                $mysqld->{'port'});
+    mtr_add_arg($args, "%s--report-user=root", $prefix);
+    mtr_add_arg($args, "%s--loose-skip-innodb", $prefix);
+    mtr_add_arg($args, "%s--skip-slave-start", $prefix);
+
+    # Directory where slaves find the dumps generated by "load data"
+    # on the server. The path need to have constant length otherwise
+    # test results will vary, thus a relative path is used.
+    my $slave_load_path= "../tmp";
+    mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix,
+                $slave_load_path);
+    mtr_add_arg($args, "%s--set-variable=slave_net_timeout=120", $prefix);
+
+    if ( @$slave_master_info )
+    {
+      foreach my $arg ( @$slave_master_info )
+      {
+        mtr_add_arg($args, "%s%s", $prefix, $arg);
+      }
+    }
+    else
+    {
+      if ($mysql_version_id < 50200)
+      {
+        mtr_add_arg($args, "%s--master-user=root", $prefix);
+        mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
+        mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
+        mtr_add_arg($args, "%s--master-password=", $prefix);
+        mtr_add_arg($args, "%s--master-port=%d", $prefix,
+    	            $master->[0]->{'port'}); # First master
+      }
+      my $slave_server_id=  2 + $idx;
+      my $slave_rpl_rank= $slave_server_id;
+      mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);
+      mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank);
+    }
+
+    my $cluster= $clusters->[$mysqld->{'cluster'}];
+    if ( $cluster->{'pid'} ||         # Slave cluster is started
+	 $cluster->{'use_running'} )  # Using running slave cluster
+    {
+      mtr_add_arg($args, "%s--ndbcluster", $prefix);
+      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
+		  $cluster->{'connect_string'});
+
+      if ( $mysql_version_id >= 50100 )
+      {
+	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
+      }
+    }
+    else
+    {
+      mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
+    }
+
+  } # end slave
+
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s%s.trace",
+		$prefix, $path_vardir_trace, $mysqld->{'type'}, $sidx);
+  }
+
+  mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix);
+  mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);
+  mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);
+
+  if ( $opt_ssl_supported )
+  {
+    mtr_add_arg($args, "%s--ssl-ca=%s/std_data/cacert.pem", $prefix,
+                $glob_mysql_test_dir);
+    mtr_add_arg($args, "%s--ssl-cert=%s/std_data/server-cert.pem", $prefix,
+                $glob_mysql_test_dir);
+    mtr_add_arg($args, "%s--ssl-key=%s/std_data/server-key.pem", $prefix,
+                $glob_mysql_test_dir);
+  }
+
+  if ( $opt_warnings )
+  {
+    mtr_add_arg($args, "%s--log-warnings", $prefix);
+  }
+
+  # Indicate to "mysqld" it will be debugged in debugger
+  if ( $glob_debugger )
+  {
+    mtr_add_arg($args, "%s--gdb", $prefix);
+  }
+
+  my $found_skip_core= 0;
+  foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
+  {
+    # Allow --skip-core-file to be set in <testname>-[master|slave].opt file
+    if ($arg eq "--skip-core-file")
+    {
+      $found_skip_core= 1;
+    }
+    elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
+    {
+      ; # Dont add --binlog-format when running without binlog
+    }
+    else
+    {
+      mtr_add_arg($args, "%s%s", $prefix, $arg);
+    }
+  }
+  if ( !$found_skip_core )
+  {
+    mtr_add_arg($args, "%s%s", $prefix, "--core-file");
+  }
+
+  if ( $opt_bench )
+  {
+    mtr_add_arg($args, "%s--rpl-recovery-rank=1", $prefix);
+    mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
+  }
+  elsif ( $mysqld->{'type'} eq 'master' )
+  {
+    mtr_add_arg($args, "%s--open-files-limit=1024", $prefix);
+  }
+
+  return $args;
+}
+
+
+##############################################################################
+#
+#  Start mysqld and return the PID
+#
+##############################################################################
+
+sub mysqld_start ($$$) {
+  my $mysqld=            shift;
+  my $extra_opt=         shift;
+  my $slave_master_info= shift;
+
+  my $args;                             # Arg vector
+  my $exe;
+  my $pid= -1;
+  my $wait_for_pid_file= 1;
+
+  my $type= $mysqld->{'type'};
+  my $idx= $mysqld->{'idx'};
+
+  mtr_error("Internal error: mysqld should never be started for embedded")
+    if $glob_use_embedded_server;
+
+  if ( $type eq 'master' )
+  {
+    $exe= $exe_master_mysqld;
+  }
+  elsif ( $type eq 'slave' )
+  {
+    $exe= $exe_slave_mysqld;
+  }
+  else
+  {
+    mtr_error("Unknown 'type' \"$type\" passed to mysqld_start");
+  }
+
+  mtr_init_args(\$args);
+
+  if ( $opt_valgrind_mysqld )
+  {
+    valgrind_arguments($args, \$exe);
+  }
+
+  mysqld_arguments($args,$mysqld,$extra_opt,$slave_master_info);
+
+  if ( $opt_gdb || $opt_manual_gdb)
+  {
+    gdb_arguments(\$args, \$exe, "$type"."_$idx");
+  }
+  elsif ( $opt_ddd || $opt_manual_ddd )
+  {
+    ddd_arguments(\$args, \$exe, "$type"."_$idx");
+  }
+  elsif ( $opt_debugger )
+  {
+    debugger_arguments(\$args, \$exe, "$type"."_$idx");
+  }
+  elsif ( $opt_manual_debug )
+  {
+     print "\nStart $type in your debugger\n" .
+           "dir: $glob_mysql_test_dir\n" .
+           "exe: $exe\n" .
+	   "args:  " . join(" ", @$args)  . "\n\n" .
+	   "Waiting ....\n";
+
+     # Indicate the exe should not be started
+    $exe= undef;
+  }
+  else
+  {
+    # Default to not wait until pid file has been created
+    $wait_for_pid_file= 0;
+  }
+
+  # Remove the pidfile
+  unlink($mysqld->{'path_pid'});
+
+  if ( defined $exe )
+  {
+    $pid= mtr_spawn($exe, $args, "",
+		    $mysqld->{'path_myerr'},
+		    $mysqld->{'path_myerr'},
+		    "",
+		    { append_log_file => 1 });
+  }
+
+
+  if ( $wait_for_pid_file && !sleep_until_file_created($mysqld->{'path_pid'},
+						       $mysqld->{'start_timeout'},
+						       $pid))
+  {
+
+    mtr_error("Failed to start mysqld $mysqld->{'type'}");
+  }
+
+
+  # Remember pid of the started process
+  $mysqld->{'pid'}= $pid;
+
+  # Remember options used when starting
+  $mysqld->{'start_opts'}= $extra_opt;
+  $mysqld->{'start_slave_master_info'}= $slave_master_info;
+
+  mtr_verbose("mysqld pid: $pid");
+  return $pid;
+}
+
+
+sub stop_all_servers () {
+
+  mtr_report("Stopping All Servers");
+
+  if ( ! $opt_skip_im )
+  {
+    mtr_report("Shutting-down Instance Manager");
+    unless (mtr_im_stop($instance_manager, "stop_all_servers"))
+    {
+      mtr_error("Failed to stop Instance Manager.")
+    }
+  }
+
+  my %admin_pids; # hash of admin processes that requests shutdown
+  my @kill_pids;  # list of processes to shutdown/kill
+  my $pid;
+
+  # Start shutdown of all started masters
+  foreach my $mysqld (@{$slave}, @{$master})
+  {
+    if ( $mysqld->{'pid'} )
+    {
+      $pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
+      $admin_pids{$pid}= 1;
+
+      push(@kill_pids,{
+		       pid      => $mysqld->{'pid'},
+                       real_pid => $mysqld->{'real_pid'},
+		       pidfile  => $mysqld->{'path_pid'},
+		       sockfile => $mysqld->{'path_sock'},
+		       port     => $mysqld->{'port'},
+                       errfile  => $mysqld->{'path_myerr'},
+		      });
+
+      $mysqld->{'pid'}= 0; # Assume we are done with it
+    }
+  }
+
+  # Start shutdown of clusters
+  foreach my $cluster (@{$clusters})
+  {
+    if ( $cluster->{'pid'} )
+    {
+      $pid= mtr_ndbmgm_start($cluster, "shutdown");
+      $admin_pids{$pid}= 1;
+
+      push(@kill_pids,{
+		       pid      => $cluster->{'pid'},
+		       pidfile  => $cluster->{'path_pid'}
+		      });
+
+      $cluster->{'pid'}= 0; # Assume we are done with it
+
+      foreach my $ndbd (@{$cluster->{'ndbds'}})
+      {
+        if ( $ndbd->{'pid'} )
+	{
+	  push(@kill_pids,{
+			   pid      => $ndbd->{'pid'},
+			   pidfile  => $ndbd->{'path_pid'},
+			  });
+	  $ndbd->{'pid'}= 0;
+	}
+      }
+    }
+  }
+
+  # Wait blocking until all shutdown processes has completed
+  mtr_wait_blocking(\%admin_pids);
+
+  # Make sure that process has shutdown else try to kill them
+  mtr_check_stop_servers(\@kill_pids);
+
+  foreach my $mysqld (@{$master}, @{$slave})
+  {
+    rm_ndbcluster_tables($mysqld->{'path_myddir'});
+  }
+}
+
+
+sub run_testcase_need_master_restart($)
+{
+  my ($tinfo)= @_;
+
+  # We try to find out if we are to restart the master(s)
+  my $do_restart= 0;          # Assumes we don't have to
+
+  if ( $glob_use_embedded_server )
+  {
+    mtr_verbose("Never start or restart for embedded server");
+    return $do_restart;
+  }
+  elsif ( $tinfo->{'master_sh'} )
+  {
+    $do_restart= 1;           # Always restart if script to run
+    mtr_verbose("Restart master: Always restart if script to run");
+  }
+  if ( $tinfo->{'force_restart'} )
+  {
+    $do_restart= 1; # Always restart if --force-restart in -opt file
+    mtr_verbose("Restart master: Restart forced with --force-restart");
+  }
+  elsif ( ! $opt_skip_ndbcluster and
+	  !$tinfo->{'ndb_test'} and
+	  $clusters->[0]->{'pid'} != 0 )
+  {
+    $do_restart= 1;           # Restart without cluster
+    mtr_verbose("Restart master: Test does not need cluster");
+  }
+  elsif ( ! $opt_skip_ndbcluster and
+	  $tinfo->{'ndb_test'} and
+	  $clusters->[0]->{'pid'} == 0 )
+  {
+    $do_restart= 1;           # Restart with cluster
+    mtr_verbose("Restart master: Test need cluster");
+  }
+  elsif( $tinfo->{'component_id'} eq 'im' )
+  {
+    $do_restart= 1;
+    mtr_verbose("Restart master: Always restart for im tests");
+  }
+  elsif ( $master->[0]->{'running_master_options'} and
+	  $master->[0]->{'running_master_options'}->{'timezone'} ne
+	  $tinfo->{'timezone'})
+  {
+    $do_restart= 1;
+    mtr_verbose("Restart master: Different timezone");
+  }
+  # Check that running master was started with same options
+  # as the current test requires
+  elsif (! mtr_same_opts($master->[0]->{'start_opts'},
+                         $tinfo->{'master_opt'}) )
+  {
+    $do_restart= 1;
+    mtr_verbose("Restart master: running with different options '" .
+		join(" ", @{$tinfo->{'master_opt'}}) . "' != '" .
+	  	join(" ", @{$master->[0]->{'start_opts'}}) . "'" );
+  }
+  elsif( ! $master->[0]->{'pid'} )
+  {
+    if ( $opt_extern )
+    {
+      $do_restart= 0;
+      mtr_verbose("No restart: using extern master");
+    }
+    else
+    {
+      $do_restart= 1;
+      mtr_verbose("Restart master: master is not started");
+    }
+  }
+  return $do_restart;
+}
+
+sub run_testcase_need_slave_restart($)
+{
+  my ($tinfo)= @_;
+
+  # We try to find out if we are to restart the slaves
+  my $do_slave_restart= 0;     # Assumes we don't have to
+
+  if ( $glob_use_embedded_server )
+  {
+    mtr_verbose("Never start or restart for embedded server");
+    return $do_slave_restart;
+  }
+  elsif ( $max_slave_num == 0)
+  {
+    mtr_verbose("Skip slave restart: No testcase use slaves");
+  }
+  else
+  {
+
+    # Check if any slave is currently started
+    my $any_slave_started= 0;
+    foreach my $mysqld (@{$slave})
+    {
+      if ( $mysqld->{'pid'} )
+      {
+	$any_slave_started= 1;
+	last;
+      }
+    }
+
+    if ($any_slave_started)
+    {
+      mtr_verbose("Restart slave: Slave is started, always restart");
+      $do_slave_restart= 1;
+    }
+    elsif ( $tinfo->{'slave_num'} )
+    {
+      mtr_verbose("Restart slave: Test need slave");
+      $do_slave_restart= 1;
+    }
+  }
+
+  return $do_slave_restart;
+
+}
+
+# ----------------------------------------------------------------------
+# If not using a running servers we may need to stop and restart.
+# We restart in the case we have initiation scripts, server options
+# etc to run. But we also restart again after the test first restart
+# and test is run, to get back to normal server settings.
+#
+# To make the code a bit more clean, we actually only stop servers
+# here, and mark this to be done. Then a generic "start" part will
+# start up the needed servers again.
+# ----------------------------------------------------------------------
+
+sub run_testcase_stop_servers($$$) {
+  my ($tinfo, $do_restart, $do_slave_restart)= @_;
+  my $pid;
+  my %admin_pids; # hash of admin processes that requests shutdown
+  my @kill_pids;  # list of processes to shutdown/kill
+
+  # Remember if we restarted for this test case (count restarts)
+  $tinfo->{'restarted'}= $do_restart;
+
+  if ( $do_restart )
+  {
+    delete $master->[0]->{'running_master_options'}; # Forget history
+
+    # Start shutdown of all started masters
+    foreach my $mysqld (@{$master})
+    {
+      if ( $mysqld->{'pid'} )
+      {
+	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
+
+	$admin_pids{$pid}= 1;
+
+	push(@kill_pids,{
+			 pid      => $mysqld->{'pid'},
+			 real_pid => $mysqld->{'real_pid'},
+			 pidfile  => $mysqld->{'path_pid'},
+			 sockfile => $mysqld->{'path_sock'},
+			 port     => $mysqld->{'port'},
+			 errfile   => $mysqld->{'path_myerr'},
+			});
+
+	$mysqld->{'pid'}= 0; # Assume we are done with it
+      }
+    }
+
+    # Start shutdown of master cluster
+    my $cluster= $clusters->[0];
+    if ( $cluster->{'pid'} )
+    {
+      $pid= mtr_ndbmgm_start($cluster, "shutdown");
+      $admin_pids{$pid}= 1;
+
+      push(@kill_pids,{
+		       pid      => $cluster->{'pid'},
+		       pidfile  => $cluster->{'path_pid'}
+		      });
+
+      $cluster->{'pid'}= 0; # Assume we are done with it
+
+      foreach my $ndbd (@{$cluster->{'ndbds'}})
+      {
+	push(@kill_pids,{
+			 pid      => $ndbd->{'pid'},
+			 pidfile  => $ndbd->{'path_pid'},
+			});
+	$ndbd->{'pid'}= 0; # Assume we are done with it
+      }
+    }
+  }
+
+  if ( $do_restart || $do_slave_restart )
+  {
+
+    delete $slave->[0]->{'running_slave_options'}; # Forget history
+
+    # Start shutdown of all started slaves
+    foreach my $mysqld (@{$slave})
+    {
+      if ( $mysqld->{'pid'} )
+      {
+	$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
+
+	$admin_pids{$pid}= 1;
+
+	push(@kill_pids,{
+			 pid      => $mysqld->{'pid'},
+			 real_pid => $mysqld->{'real_pid'},
+			 pidfile  => $mysqld->{'path_pid'},
+			 sockfile => $mysqld->{'path_sock'},
+			 port     => $mysqld->{'port'},
+			 errfile   => $mysqld->{'path_myerr'},
+			});
+
+
+	$mysqld->{'pid'}= 0; # Assume we are done with it
+      }
+    }
+
+    # Start shutdown of slave cluster
+    my $cluster= $clusters->[1];
+    if ( $cluster->{'pid'} )
+    {
+      $pid= mtr_ndbmgm_start($cluster, "shutdown");
+
+      $admin_pids{$pid}= 1;
+
+      push(@kill_pids,{
+		       pid      => $cluster->{'pid'},
+		       pidfile  => $cluster->{'path_pid'}
+		      });
+
+      $cluster->{'pid'}= 0; # Assume we are done with it
+
+      foreach my $ndbd (@{$cluster->{'ndbds'}} )
+      {
+	push(@kill_pids,{
+			 pid      => $ndbd->{'pid'},
+			 pidfile  => $ndbd->{'path_pid'},
+			});
+	$ndbd->{'pid'}= 0; # Assume we are done with it
+      }
+    }
+  }
+
+  # ----------------------------------------------------------------------
+  # Shutdown has now been started and lists for the shutdown processes
+  # and the processes to be killed has been created
+  # ----------------------------------------------------------------------
+
+  # Wait blocking until all shutdown processes has completed
+  mtr_wait_blocking(\%admin_pids);
+
+
+  # Make sure that process has shutdown else try to kill them
+  mtr_check_stop_servers(\@kill_pids);
+
+  foreach my $mysqld (@{$master}, @{$slave})
+  {
+    if ( ! $mysqld->{'pid'} )
+    {
+      # Remove ndbcluster tables if server is stopped
+      rm_ndbcluster_tables($mysqld->{'path_myddir'});
+    }
+  }
+}
+
+
+#
+# run_testcase_start_servers
+#
+# Start the servers needed by this test case
+#
+# RETURN
+#  0 OK
+#  1 Start failed
+#
+
+sub run_testcase_start_servers($) {
+  my $tinfo= shift;
+  my $tname= $tinfo->{'name'};
+
+  if ( $tinfo->{'component_id'} eq 'mysqld' )
+  {
+    if ( ! $opt_skip_ndbcluster and
+	 !$clusters->[0]->{'pid'} and
+	 $tinfo->{'ndb_test'} )
+    {
+      # Test need cluster, cluster is not started, start it
+      ndbcluster_start($clusters->[0], "");
+    }
+
+    if ( !$master->[0]->{'pid'} )
+    {
+      # Master mysqld is not started
+      do_before_start_master($tinfo);
+
+      mysqld_start($master->[0],$tinfo->{'master_opt'},[]);
+
+    }
+
+    if ( $clusters->[0]->{'pid'} || $clusters->[0]->{'use_running'}
+	 and ! $master->[1]->{'pid'} and
+	 $tinfo->{'master_num'} > 1 )
+    {
+      # Test needs cluster, start an extra mysqld connected to cluster
+
+      if ( $mysql_version_id >= 50100 )
+      {
+	# First wait for first mysql server to have created ndb system
+	# tables ok FIXME This is a workaround so that only one mysqld
+	# create the tables
+	if ( ! sleep_until_file_created(
+		  "$master->[0]->{'path_myddir'}/mysql/ndb_apply_status.ndb",
+					$master->[0]->{'start_timeout'},
+					$master->[0]->{'pid'}))
+	{
+
+	  $tinfo->{'comment'}= "Failed to create 'mysql/ndb_apply_status' table";
+	  return 1;
+	}
+      }
+      mysqld_start($master->[1],$tinfo->{'master_opt'},[]);
+    }
+
+    # Save this test case information, so next can examine it
+    $master->[0]->{'running_master_options'}= $tinfo;
+  }
+  elsif ( ! $opt_skip_im and $tinfo->{'component_id'} eq 'im' )
+  {
+    # We have to create defaults file every time, in order to ensure that it
+    # will be the same for each test. The problem is that test can change the
+    # file (by SET/UNSET commands), so w/o recreating the file, execution of
+    # one test can affect the other.
+
+    im_create_defaults_file($instance_manager);
+
+    if  ( ! mtr_im_start($instance_manager, $tinfo->{im_opts}) )
+    {
+      $tinfo->{'comment'}= "Failed to start Instance Manager. ";
+      return 1;
+    }
+  }
+
+  # ----------------------------------------------------------------------
+  # Start slaves - if needed
+  # ----------------------------------------------------------------------
+  if ( $tinfo->{'slave_num'} )
+  {
+    restore_slave_databases($tinfo->{'slave_num'});
+
+    do_before_start_slave($tinfo);
+
+    if ( ! $opt_skip_ndbcluster_slave and
+	 !$clusters->[1]->{'pid'} and
+	 $tinfo->{'ndb_test'} )
+    {
+      # Test need slave cluster, cluster is not started, start it
+      ndbcluster_start($clusters->[1], "");
+    }
+
+    for ( my $idx= 0; $idx <  $tinfo->{'slave_num'}; $idx++ )
+    {
+      if ( ! $slave->[$idx]->{'pid'} )
+      {
+	mysqld_start($slave->[$idx],$tinfo->{'slave_opt'},
+		     $tinfo->{'slave_mi'});
+
+      }
+    }
+
+    # Save this test case information, so next can examine it
+    $slave->[0]->{'running_slave_options'}= $tinfo;
+  }
+
+  # Wait for clusters to start
+  foreach my $cluster (@{$clusters})
+  {
+
+    next if !$cluster->{'pid'};
+
+    if (ndbcluster_wait_started($cluster, ""))
+    {
+      # failed to start
+      $tinfo->{'comment'}= "Start of $cluster->{'name'} cluster failed";
+      return 1;
+    }
+  }
+
+  # Wait for mysqld's to start
+  foreach my $mysqld (@{$master},@{$slave})
+  {
+
+    next if !$mysqld->{'pid'};
+
+    if (mysqld_wait_started($mysqld))
+    {
+      # failed to start
+      $tinfo->{'comment'}=
+	"Failed to start $mysqld->{'type'} mysqld $mysqld->{'idx'}";
+      return 1;
+    }
+  }
+  return 0;
+}
+
+#
+# Run include/check-testcase.test
+# Before a testcase, run in record mode, save result file to var
+# After testcase, run and compare with the recorded file, they should be equal!
+#
+# RETURN VALUE
+#  0 OK
+#  1 Check failed
+#
+sub run_check_testcase ($$) {
+
+  my $mode=     shift;
+  my $mysqld=   shift;
+
+  my $name= "check-" . $mysqld->{'type'} . $mysqld->{'idx'};
+
+  my $args;
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--silent");
+  mtr_add_arg($args, "--skip-safemalloc");
+  mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir);
+  mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
+
+  mtr_add_arg($args, "--socket=%s", $mysqld->{'path_sock'});
+  mtr_add_arg($args, "--port=%d", $mysqld->{'port'});
+  mtr_add_arg($args, "--database=test");
+  mtr_add_arg($args, "--user=%s", $opt_user);
+  mtr_add_arg($args, "--password=");
+
+  mtr_add_arg($args, "-R");
+  mtr_add_arg($args, "$opt_vardir/tmp/$name.result");
+
+  if ( $mode eq "before" )
+  {
+    mtr_add_arg($args, "--record");
+  }
+
+  my $res = mtr_run_test($exe_mysqltest,$args,
+	        "include/check-testcase.test", "", "", "");
+
+  if ( $res == 1  and $mode eq "after")
+  {
+    mtr_run("diff",["-u",
+		    "$opt_vardir/tmp/$name.result",
+		    "$opt_vardir/tmp/$name.reject"],
+	    "", "", "", "");
+  }
+  elsif ( $res )
+  {
+    mtr_error("Could not execute 'check-testcase' $mode testcase");
+  }
+  return $res;
+}
+
+##############################################################################
+#
+#  Report the features that were compiled in
+#
+##############################################################################
+
+sub run_report_features () {
+  my $args;
+
+  if ( ! $glob_use_embedded_server )
+  {
+    mysqld_start($master->[0],[],[]);
+    if ( ! $master->[0]->{'pid'} )
+    {
+      mtr_error("Can't start the mysqld server");
+    }
+    mysqld_wait_started($master->[0]);
+  }
+
+  my $tinfo = {};
+  $tinfo->{'name'} = 'report features';
+  $tinfo->{'result_file'} = undef;
+  $tinfo->{'component_id'} = 'mysqld';
+  $tinfo->{'path'} = 'include/report-features.test';
+  $tinfo->{'timezone'}=  "GMT-3";
+  $tinfo->{'slave_num'} = 0;
+  $tinfo->{'master_opt'} = [];
+  $tinfo->{'slave_opt'} = [];
+  $tinfo->{'slave_mi'} = [];
+  $tinfo->{'comment'} = 'report server features';
+  run_mysqltest($tinfo);
+
+  if ( ! $glob_use_embedded_server )
+  {
+    stop_all_servers();
+  }
+}
+
+
+sub run_mysqltest ($) {
+  my ($tinfo)= @_;
+  my $exe= $exe_mysqltest;
+  my $args;
+
+  mtr_init_args(\$args);
+
+  mtr_add_arg($args, "--no-defaults");
+  mtr_add_arg($args, "--silent");
+  mtr_add_arg($args, "--skip-safemalloc");
+  mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir);
+  mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
+  mtr_add_arg($args, "--logdir=%s/log", $opt_vardir);
+
+  # Log line number and time  for each line in .test file
+  mtr_add_arg($args, "--mark-progress")
+    if $opt_mark_progress;
+
+  if ($tinfo->{'component_id'} eq 'im')
+  {
+    mtr_add_arg($args, "--socket=%s", $instance_manager->{'path_sock'});
+    mtr_add_arg($args, "--port=%d", $instance_manager->{'port'});
+    mtr_add_arg($args, "--user=%s", $instance_manager->{'admin_login'});
+    mtr_add_arg($args, "--password=%s", $instance_manager->{'admin_password'});
+  }
+  else # component_id == mysqld
+  {
+    mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
+    mtr_add_arg($args, "--port=%d", $master->[0]->{'port'});
+    mtr_add_arg($args, "--database=test");
+    mtr_add_arg($args, "--user=%s", $opt_user);
+    mtr_add_arg($args, "--password=");
+  }
+
+  if ( $opt_ps_protocol )
+  {
+    mtr_add_arg($args, "--ps-protocol");
+  }
+
+  if ( $opt_sp_protocol )
+  {
+    mtr_add_arg($args, "--sp-protocol");
+  }
+
+  if ( $opt_view_protocol )
+  {
+    mtr_add_arg($args, "--view-protocol");
+  }
+
+  if ( $opt_cursor_protocol )
+  {
+    mtr_add_arg($args, "--cursor-protocol");
+  }
+
+  if ( $opt_strace_client )
+  {
+    $exe=  "strace";            # FIXME there are ktrace, ....
+    mtr_add_arg($args, "-o");
+    mtr_add_arg($args, "%s/log/mysqltest.strace", $opt_vardir);
+    mtr_add_arg($args, "$exe_mysqltest");
+  }
+
+  if ( $opt_timer )
+  {
+    mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
+  }
+
+  if ( $opt_compress )
+  {
+    mtr_add_arg($args, "--compress");
+  }
+
+  if ( $opt_sleep )
+  {
+    mtr_add_arg($args, "--sleep=%d", $opt_sleep);
+  }
+
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace",
+		$path_vardir_trace);
+  }
+
+  if ( $opt_ssl_supported )
+  {
+    mtr_add_arg($args, "--ssl-ca=%s/std_data/cacert.pem",
+	        $glob_mysql_test_dir);
+    mtr_add_arg($args, "--ssl-cert=%s/std_data/client-cert.pem",
+	        $glob_mysql_test_dir);
+    mtr_add_arg($args, "--ssl-key=%s/std_data/client-key.pem",
+	        $glob_mysql_test_dir);
+  }
+
+  if ( $opt_ssl )
+  {
+    # Turn on SSL for _all_ test cases if option --ssl was used
+    mtr_add_arg($args, "--ssl");
+  }
+  elsif ( $opt_ssl_supported )
+  {
+    mtr_add_arg($args, "--skip-ssl");
+  }
+
+  # ----------------------------------------------------------------------
+  # If embedded server, we create server args to give mysqltest to pass on
+  # ----------------------------------------------------------------------
+
+  if ( $glob_use_embedded_server )
+  {
+    mysqld_arguments($args,$master->[0],$tinfo->{'master_opt'},[]);
+  }
+
+  # ----------------------------------------------------------------------
+  # export MYSQL_TEST variable containing <path>/mysqltest <args>
+  # ----------------------------------------------------------------------
+  $ENV{'MYSQL_TEST'}=
+    mtr_native_path($exe_mysqltest) . " " . join(" ", @$args);
+
+  # ----------------------------------------------------------------------
+  # Add arguments that should not go into the MYSQL_TEST env var
+  # ----------------------------------------------------------------------
+
+  if ( $opt_valgrind_mysqltest )
+  {
+    # Prefix the Valgrind options to the argument list.
+    # We do this here, since we do not want to Valgrind the nested invocations
+    # of mysqltest; that would mess up the stderr output causing test failure.
+    my @args_saved = @$args;
+    mtr_init_args(\$args);
+    valgrind_arguments($args, \$exe);
+    mtr_add_arg($args, "%s", $_) for @args_saved;
+  }
+
+  mtr_add_arg($args, "--test-file=%s", $tinfo->{'path'});
+
+  # Number of lines of resut to include in failure report
+  mtr_add_arg($args, "--tail-lines=20");
+
+  if ( defined $tinfo->{'result_file'} ) {
+    mtr_add_arg($args, "--result-file=%s", $tinfo->{'result_file'});
+  }
+
+  if ( $opt_record )
+  {
+    mtr_add_arg($args, "--record");
+  }
+
+  if ( $opt_client_gdb )
+  {
+    gdb_arguments(\$args, \$exe, "client");
+  }
+  elsif ( $opt_client_ddd )
+  {
+    ddd_arguments(\$args, \$exe, "client");
+  }
+  elsif ( $opt_client_debugger )
+  {
+    debugger_arguments(\$args, \$exe, "client");
+  }
+
+  if ( $opt_check_testcases )
+  {
+    foreach my $mysqld (@{$master}, @{$slave})
+    {
+      if ($mysqld->{'pid'})
+      {
+	run_check_testcase("before", $mysqld);
+      }
+    }
+  }
+
+  my $res = mtr_run_test($exe,$args,"","",$path_timefile,"");
+
+  if ( $opt_check_testcases )
+  {
+    foreach my $mysqld (@{$master}, @{$slave})
+    {
+      if ($mysqld->{'pid'})
+      {
+	if (run_check_testcase("after", $mysqld))
+	{
+	  # Check failed, mark the test case with that info
+	  $tinfo->{'check_testcase_failed'}= 1;
+	}
+      }
+    }
+  }
+
+  return $res;
+
+}
+
+
+#
+# Modify the exe and args so that program is run in gdb in xterm
+#
+sub gdb_arguments {
+  my $args= shift;
+  my $exe=  shift;
+  my $type= shift;
+
+  # Write $args to gdb init file
+  my $str= join(" ", @$$args);
+  my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";
+
+  # Remove the old gdbinit file
+  unlink($gdb_init_file);
+
+  if ( $type eq "client" )
+  {
+    # write init file for client
+    mtr_tofile($gdb_init_file,
+	       "set args $str\n" .
+	       "break main\n");
+  }
+  else
+  {
+    # write init file for mysqld
+    mtr_tofile($gdb_init_file,
+	       "set args $str\n" .
+	       "break mysql_parse\n" .
+	       "commands 1\n" .
+	       "disable 1\n" .
+	       "end\n" .
+	       "run");
+  }
+
+  if ( $opt_manual_gdb )
+  {
+     print "\nTo start gdb for $type, type in another window:\n";
+     print "gdb -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
+
+     # Indicate the exe should not be started
+     $$exe= undef;
+     return;
+  }
+
+  $$args= [];
+  mtr_add_arg($$args, "-title");
+  mtr_add_arg($$args, "$type");
+  mtr_add_arg($$args, "-e");
+
+  if ( $exe_libtool )
+  {
+    mtr_add_arg($$args, $exe_libtool);
+    mtr_add_arg($$args, "--mode=execute");
+  }
+
+  mtr_add_arg($$args, "gdb");
+  mtr_add_arg($$args, "-x");
+  mtr_add_arg($$args, "$gdb_init_file");
+  mtr_add_arg($$args, "$$exe");
+
+  $$exe= "xterm";
+}
+
+
+#
+# Modify the exe and args so that program is run in ddd
+#
+sub ddd_arguments {
+  my $args= shift;
+  my $exe=  shift;
+  my $type= shift;
+
+  # Write $args to ddd init file
+  my $str= join(" ", @$$args);
+  my $gdb_init_file= "$opt_tmpdir/gdbinit.$type";
+
+  # Remove the old gdbinit file
+  unlink($gdb_init_file);
+
+  if ( $type eq "client" )
+  {
+    # write init file for client
+    mtr_tofile($gdb_init_file,
+	       "set args $str\n" .
+	       "break main\n");
+  }
+  else
+  {
+    # write init file for mysqld
+    mtr_tofile($gdb_init_file,
+	       "file $$exe\n" .
+	       "set args $str\n" .
+	       "break mysql_parse\n" .
+	       "commands 1\n" .
+	       "disable 1\n" .
+	       "end");
+  }
+
+  if ( $opt_manual_ddd )
+  {
+     print "\nTo start ddd for $type, type in another window:\n";
+     print "ddd -cd $glob_mysql_test_dir -x $gdb_init_file $$exe\n";
+
+     # Indicate the exe should not be started
+     $$exe= undef;
+     return;
+  }
+
+  my $save_exe= $$exe;
+  $$args= [];
+  if ( $exe_libtool )
+  {
+    $$exe= $exe_libtool;
+    mtr_add_arg($$args, "--mode=execute");
+    mtr_add_arg($$args, "ddd");
+  }
+  else
+  {
+    $$exe= "ddd";
+  }
+  mtr_add_arg($$args, "--command=$gdb_init_file");
+  mtr_add_arg($$args, "$save_exe");
+}
+
+
+#
+# Modify the exe and args so that program is run in the selected debugger
+#
+sub debugger_arguments {
+  my $args= shift;
+  my $exe=  shift;
+  my $debugger= $opt_debugger || $opt_client_debugger;
+
+  if ( $debugger =~ /vcexpress|vc|devenv/ )
+  {
+    # vc[express] /debugexe exe arg1 .. argn
+
+    # Add /debugexe and name of the exe before args
+    unshift(@$$args, "/debugexe");
+    unshift(@$$args, "$$exe");
+
+    # Set exe to debuggername
+    $$exe= $debugger;
+
+  }
+  elsif ( $debugger =~ /windbg/ )
+  {
+    # windbg exe arg1 .. argn
+
+    # Add name of the exe before args
+    unshift(@$$args, "$$exe");
+
+    # Set exe to debuggername
+    $$exe= $debugger;
+
+  }
+  elsif ( $debugger eq "dbx" )
+  {
+    # xterm -e dbx -r exe arg1 .. argn
+
+    unshift(@$$args, $$exe);
+    unshift(@$$args, "-r");
+    unshift(@$$args, $debugger);
+    unshift(@$$args, "-e");
+
+    $$exe= "xterm";
+
+  }
+  else
+  {
+    mtr_error("Unknown argument \"$debugger\" passed to --debugger");
+  }
+}
+
+
+#
+# Modify the exe and args so that program is run in valgrind
+#
+sub valgrind_arguments {
+  my $args= shift;
+  my $exe=  shift;
+
+  if ( $opt_callgrind)
+  {
+    mtr_add_arg($args, "--tool=callgrind");
+    mtr_add_arg($args, "--base=$opt_vardir/log");
+  }
+  else
+  {
+    mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option
+    mtr_add_arg($args, "--alignment=8");
+    mtr_add_arg($args, "--leak-check=yes");
+    mtr_add_arg($args, "--num-callers=16");
+    mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)
+      if -f "$glob_mysql_test_dir/valgrind.supp";
+  }
+
+  # Add valgrind options, can be overriden by user
+  mtr_add_arg($args, '%s', $_) for (@valgrind_args);
+
+  mtr_add_arg($args, $$exe);
+
+  $$exe= $opt_valgrind_path || "valgrind";
+
+  if ($exe_libtool)
+  {
+    # Add "libtool --mode-execute" before the test to execute
+    # if running in valgrind(to avoid valgrinding bash)
+    unshift(@$args, "--mode=execute", $$exe);
+    $$exe= $exe_libtool;
+  }
+}
+
+
+##############################################################################
+#
+#  Usage
+#
+##############################################################################
+
+sub usage ($) {
+  my $message= shift;
+
+  if ( $message )
+  {
+    print STDERR "$message\n";
+  }
+
+  print <<HERE;
+
+$0 [ OPTIONS ] [ TESTCASE ]
+
+Options to control what engine/variation to run
+
+  embedded-server       Use the embedded server, i.e. no mysqld daemons
+  ps-protocol           Use the binary protocol between client and server
+  cursor-protocol       Use the cursor protocol between client and server
+                        (implies --ps-protocol)
+  view-protocol         Create a view to execute all non updating queries
+  sp-protocol           Create a stored procedure to execute all queries
+  compress              Use the compressed protocol between client and server
+  ssl                   Use ssl protocol between client and server
+  skip-ssl              Dont start server with support for ssl connections
+  bench                 Run the benchmark suite
+  small-bench           Run the benchmarks with --small-tests --small-tables
+  ndb|with-ndbcluster   Use cluster as default table type
+  vs-config             Visual Studio configuration used to create executables
+                        (default: MTR_VS_CONFIG environment variable)
+
+Options to control directories to use
+  benchdir=DIR          The directory where the benchmark suite is stored
+                        (default: ../../mysql-bench)
+  tmpdir=DIR            The directory where temporary files are stored
+                        (default: ./var/tmp).
+  vardir=DIR            The directory where files generated from the test run
+                        is stored (default: ./var). Specifying a ramdisk or
+                        tmpfs will speed up tests.
+  mem                   Run testsuite in "memory" using tmpfs or ramdisk
+                        Attempts to find a suitable location
+                        using a builtin list of standard locations
+                        for tmpfs (/dev/shm)
+                        The option can also be set using environment
+                        variable MTR_MEM=[DIR]
+
+Options to control what test suites or cases to run
+
+  force                 Continue to run the suite after failure
+  with-ndbcluster-only  Run only tests that include "ndb" in the filename
+  skip-ndb[cluster]     Skip all tests that need cluster
+  skip-ndb[cluster]-slave Skip all tests that need a slave cluster
+  ndb-extra             Run extra tests from ndb directory
+  do-test=PREFIX or REGEX
+                        Run test cases which name are prefixed with PREFIX
+                        or fulfills REGEX
+  skip-test=PREFIX or REGEX
+                        Skip test cases which name are prefixed with PREFIX
+                        or fulfills REGEX
+  start-from=PREFIX     Run test cases starting from test prefixed with PREFIX
+  suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated
+                        list of suite names.
+                        The default is: "$opt_suites_default"
+  skip-rpl              Skip the replication test cases.
+  skip-im               Don't start IM, and skip the IM test cases
+  big-test              Set the environment variable BIG_TEST, which can be
+                        checked from test cases.
+  combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one
+                        combination.
+  skip-combination      Skip any combination options and combinations files
+
+Options that specify ports
+
+  master_port=PORT      Specify the port number used by the first master
+  slave_port=PORT       Specify the port number used by the first slave
+  ndbcluster-port=PORT  Specify the port number used by cluster
+  ndbcluster-port-slave=PORT  Specify the port number used by slave cluster
+  mtr-build-thread=#    Specify unique collection of ports. Can also be set by
+                        setting the environment variable MTR_BUILD_THREAD.
+
+Options for test case authoring
+
+  record TESTNAME       (Re)genereate the result file for TESTNAME
+  check-testcases       Check testcases for sideeffects
+  mark-progress         Log line number and elapsed time to <testname>.progress
+
+Options that pass on options
+
+  mysqld=ARGS           Specify additional arguments to "mysqld"
+
+Options to run test on running server
+
+  extern                Use running server for tests
+  ndb-connectstring=STR Use running cluster, and connect using STR
+  ndb-connectstring-slave=STR Use running slave cluster, and connect using STR
+  user=USER             User for connection to extern server
+  socket=PATH           Socket for connection to extern server
+
+Options for debugging the product
+
+  client-ddd            Start mysqltest client in ddd
+  client-debugger=NAME  Start mysqltest in the selected debugger
+  client-gdb            Start mysqltest client in gdb
+  ddd                   Start mysqld in ddd
+  debug                 Dump trace output for all servers and client programs
+  debugger=NAME         Start mysqld in the selected debugger
+  gdb                   Start the mysqld(s) in gdb
+  manual-debug          Let user manually start mysqld in debugger, before
+                        running test(s)
+  manual-gdb            Let user manually start mysqld in gdb, before running
+                        test(s)
+  manual-ddd            Let user manually start mysqld in ddd, before running
+                        test(s)
+  master-binary=PATH    Specify the master "mysqld" to use
+  slave-binary=PATH     Specify the slave "mysqld" to use
+  strace-client         Create strace output for mysqltest client
+  max-save-core         Limit the number of core files saved (to avoid filling
+                        up disks for heavily crashing server). Defaults to
+                        $opt_max_save_core, set to 0 for no limit.
+
+Options for coverage, profiling etc
+
+  gcov                  FIXME
+  gprof                 FIXME
+  valgrind              Run the "mysqltest" and "mysqld" executables using
+                        valgrind with default options
+  valgrind-all          Synonym for --valgrind
+  valgrind-mysqltest    Run the "mysqltest" and "mysql_client_test" executable
+                        with valgrind
+  valgrind-mysqld       Run the "mysqld" executable with valgrind
+  valgrind-options=ARGS Deprecated, use --valgrind-option
+  valgrind-option=ARGS  Option to give valgrind, replaces default option(s),
+                        can be specified more then once
+  valgrind-path=[EXE]   Path to the valgrind executable
+  callgrind             Instruct valgrind to use callgrind
+
+Misc options
+
+  comment=STR           Write STR to the output
+  notimer               Don't show test case execution time
+  script-debug          Debug this script itself
+  verbose               More verbose output
+  start-and-exit        Only initialize and start the servers, using the
+                        startup settings for the specified test case (if any)
+  start-dirty           Only start the servers (without initialization) for
+                        the specified test case (if any)
+  fast                  Don't try to clean up from earlier runs
+  reorder               Reorder tests to get fewer server restarts
+  help                  Get this help text
+
+  testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
+  suite-timeout=MINUTES Max test suite run time (default $default_suite_timeout)
+  warnings | log-warnings Pass --log-warnings to mysqld
+
+  sleep=SECONDS         Passed to mysqltest, will be used as fixed sleep time
+  client-bindir=PATH    Path to the directory where client binaries are located
+  client-libdir=PATH    Path to the directory where client libraries are located
+
+Deprecated options
+  with-openssl          Deprecated option for ssl
+
+
+HERE
+  mtr_exit(1);
+
+}
diff --git a/mysql-test/lib/v1/ndb_config_1_node.ini b/mysql-test/lib/v1/ndb_config_1_node.ini
new file mode 100644
index 00000000000..4e0be7796dc
--- /dev/null
+++ b/mysql-test/lib/v1/ndb_config_1_node.ini
@@ -0,0 +1,47 @@
+[ndbd default]
+NoOfReplicas= 1
+MaxNoOfConcurrentTransactions= 64
+MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations
+DataMemory= CHOOSE_DataMemory
+IndexMemory= CHOOSE_IndexMemory
+Diskless= CHOOSE_Diskless
+TimeBetweenWatchDogCheck= 30000
+DataDir= CHOOSE_FILESYSTEM
+MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
+MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
+TimeBetweenGlobalCheckpoints= 500
+NoOfFragmentLogFiles= 8
+FragmentLogFileSize= 6M
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory 
+
+#
+# Increase timeouts to cater for slow test-machines
+#   (possibly running several tests in parallell)
+#
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
+#TransactionDeadlockDetectionTimeout= 7500
+
+[ndbd]
+HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
+
+[ndb_mgmd]
+HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
+DataDir= CHOOSE_FILESYSTEM    #
+PortNumber= CHOOSE_PORT_MGM
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
diff --git a/mysql-test/lib/v1/ndb_config_2_node.ini b/mysql-test/lib/v1/ndb_config_2_node.ini
new file mode 100644
index 00000000000..57e4d049ad6
--- /dev/null
+++ b/mysql-test/lib/v1/ndb_config_2_node.ini
@@ -0,0 +1,55 @@
+[ndbd default]
+NoOfReplicas= 2
+MaxNoOfConcurrentTransactions= 64
+MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations
+DataMemory= CHOOSE_DataMemory
+IndexMemory= CHOOSE_IndexMemory
+Diskless= CHOOSE_Diskless
+TimeBetweenWatchDogCheck= 30000
+DataDir= CHOOSE_FILESYSTEM
+MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
+MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
+TimeBetweenGlobalCheckpoints= 500
+NoOfFragmentLogFiles= 4
+FragmentLogFileSize=12M
+DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
+# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612
+#ODirect= 1
+# the following parametes just function as a small regression
+# test that the parameter exists
+InitialNoOfOpenFiles= 27
+
+#
+# Increase timeouts to cater for slow test-machines
+#   (possibly running several tests in parallell)
+#
+HeartbeatIntervalDbDb= 30000
+HeartbeatIntervalDbApi= 30000
+#TransactionDeadlockDetectionTimeout= 7500
+
+[ndbd]
+HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
+
+[ndbd]
+HostName= CHOOSE_HOSTNAME_2   # hostname is a valid network adress
+
+[ndb_mgmd]
+HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
+DataDir= CHOOSE_FILESYSTEM    #
+PortNumber= CHOOSE_PORT_MGM
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
+
+[mysqld]
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 415b4f646a1..69e0189a6f5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -34,8 +34,34 @@ BEGIN {
   }
 }
 
+BEGIN {
+  # Check backward compatibility support
+  # By setting the environment variable MTR_VERSION
+  # it's possible to use a previous version of
+  # mysql-test-run.pl
+  my $version= $ENV{MTR_VERSION} || 2;
+  if ( $version == 1 )
+  {
+    print "=======================================================\n";
+    print "  WARNING: Using mysql-test-run.pl version 1!  \n";
+    print "=======================================================\n";
+    require "lib/v1/mysql-test-run.pl";
+    exit(1);
+  }
+  elsif ( $version == 2 )
+  {
+    # This is the current version, just continue
+    ;
+  }
+  else
+  {
+    print "ERROR: Version $version of mysql-test-run does not exist!\n";
+    exit(1);
+  }
+}
 
 use lib "lib";
+
 use Cwd;
 use Getopt::Long;
 use My::File::Path; # Patched version of File::Path