# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergii@pisem.net-20100802203334-9vg7c158cx13cy3q
# target_branch: lp:maria/5.2
# testament_sha1: 871f207021dbec51f99b1b378d3497b58241d4b3
# timestamp: 2010-08-02 23:34:10 +0300
# base_revision_id: sergii@pisem.net-20100802202047-rm609k322sd83e8e
# 
# Begin patch
=== modified file 'mysql-test/lib/My/Config.pm'
--- mysql-test/lib/My/Config.pm	2008-09-05 13:31:09 +0000
+++ mysql-test/lib/My/Config.pm	2010-08-02 20:33:34 +0000
@@ -61,7 +61,7 @@
     $option->{value}= $value;
   }
   else {
-    my $option= My::Config::Option->new($option_name, $value);
+    $option= My::Config::Option->new($option_name, $value);
     # Insert option in list
     push(@{$self->{options}}, $option);
     # Insert option in hash
@@ -141,9 +141,14 @@
 # Return value for an option in the group, fail if it does not exist
 #
 sub value {
-  my ($self, $option_name)= @_;
+  my ($self, $option_name, %create)= @_;
   my $option= $self->option($option_name);
 
+  if (! defined($option) and $create{$option_name}) {
+    my $value= &{$create{$option_name}};
+    $option = $self->insert($option_name, $value);
+  }
+
   croak "No option named '$option_name' in group '$self->{name}'"
     if ! defined($option);
 
@@ -208,12 +213,6 @@
       $self->insert($group_name, $magic, undef);
     }
 
-    # Comments
-    elsif ( $line =~ /^#/ || $line =~ /^;/) {
-      # Skip comment
-      next;
-    }
-
     # Empty lines
     elsif ( $line =~ /^$/ ) {
       # Skip empty lines
@@ -236,7 +235,7 @@
     }
 
     # <option>
-    elsif ( $line =~ /^([\@\w-]+)\s*$/ ) {
+    elsif ( $line =~ /^([#\@\w-]+)\s*$/ ) {
       my $option= $1;
 
       croak "Found option '$option' outside of group"
@@ -247,7 +246,7 @@
     }
 
     # <option>=<value>
-    elsif ( $line =~ /^([\@\w-]+)\s*=\s*(.*?)\s*$/ ) {
+    elsif ( $line =~ /^([#\@\w-]+)\s*=\s*(.*?)\s*$/ ) {
       my $option= $1;
       my $value= $2;
 
@@ -256,10 +255,17 @@
 
       #print "$option=$value\n";
       $self->insert($group_name, $option, $value);
-    } else {
+    }
+
+    # Comments
+    elsif ( $line =~ /^#/ || $line =~ /^;/) {
+      # Skip comment
+      next;
+    }
+    
+    else {
       croak "Unexpected line '$line' found in '$path'";
     }
-
   }
   undef $F;			# Close the file
 
@@ -437,44 +443,4 @@
   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 croak "Could not open '$path': $!";
-  print $F $self;
-  undef $F; # Close the file
-}
-
 1;

=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- mysql-test/lib/My/ConfigFactory.pm	2010-04-28 12:52:24 +0000
+++ mysql-test/lib/My/ConfigFactory.pm	2010-08-02 20:33:34 +0000
@@ -57,16 +57,12 @@
 
 sub fix_port {
   my ($self, $config, $group_name, $group)= @_;
-  my $hostname= $group->value('#host');
-  return $self->{HOSTS}->{$hostname}++;
+  return $self->{PORT}++;
 }
 
 sub fix_host {
   my ($self)= @_;
-  # Get next host from HOSTS array
-  my @hosts= keys(%{$self->{HOSTS}});;
-  my $host_no= $self->{NEXT_HOST}++ % @hosts;
-  return $hosts[$host_no];
+  'localhost'
 }
 
 sub is_unique {
@@ -195,6 +191,7 @@
 my @mysqld_rules=
   (
  { 'basedir' => sub { return shift->{ARGS}->{basedir}; } },
+ { '#vardir' => sub { return shift->{ARGS}->{vardir}; } },
  { 'tmpdir' => \&fix_tmpdir },
  { 'character-sets-dir' => \&fix_charset_dir },
  { 'language' => \&fix_language },
@@ -229,7 +226,7 @@
 sub fix_ndb_mgmd_port {
   my ($self, $config, $group_name, $group)= @_;
   my $hostname= $group->value('HostName');
-  return $self->{HOSTS}->{$hostname}++;
+  return $self->{PORT}++;
 }
 
 
@@ -428,20 +425,29 @@
 
 sub resolve_at_variable {
   my ($self, $config, $group, $option)= @_;
-
-  # Split the options value on last .
-  my @parts= split(/\./, $option->value());
-  my $option_name= pop(@parts);
-  my $group_name=  join('.', @parts);
-
-  $group_name =~ s/^\@//; # Remove at
-
-  my $from_group= $config->group($group_name)
-    or croak "There is no group named '$group_name' that ",
-      "can be used to resolve '$option_name'";
-
-  my $from= $from_group->value($option_name);
-  $config->insert($group->name(), $option->name(), $from)
+  local $_ = $option->value();
+  my ($res, $after);
+
+  while (m/(.*?)\@((?:\w+\.)+)(#?[-\w]+)/gi) {
+    my ($before, $group_name, $option_name)= ($1, $2, $3);
+    $after = $';
+    chop($group_name);
+
+    my $from_group= $config->group($group_name)
+      or croak "There is no group named '$group_name' that ",
+        "can be used to resolve '$option_name'";
+
+    my @auto_options = (
+      'port'     => sub { fix_port($self, $config, $group_name, $group) },
+      '#port'    => sub { fix_port($self, $config, $group_name, $group) },
+    );
+    my $value= $from_group->value($option_name, @auto_options);
+    $res .= $before.$value;
+  }
+  m/\G.*/;
+  $res .= $after;
+
+  $config->insert($group->name(), $option->name(), $res)
 }
 
 
@@ -453,7 +459,7 @@
       next unless defined $option->value();
 
       $self->resolve_at_variable($config, $group, $option)
-	if ($option->value() =~ /^\@/);
+	if ($option->value() =~ /\@/);
     }
   }
 }
@@ -595,25 +601,12 @@
     croak "you must pass '$required'" unless defined $args->{$required};
   }
 
-  # Fill in hosts/port hash
-  my $hosts= {};
-  my $baseport= $args->{baseport};
-  $args->{hosts}= [ 'localhost' ] unless exists($args->{hosts});
-  foreach my $host ( @{$args->{hosts}} ) {
-     $hosts->{$host}= $baseport;
-  }
-
   # Open the config template
   my $config= My::Config->new($args->{'template_path'});
-  my $extra_template_path= $args->{'extra_template_path'};
-  if ($extra_template_path){
-    $config->append(My::Config->new($extra_template_path));
-  }
   my $self= bless {
 		   CONFIG       => $config,
 		   ARGS         => $args,
-		   HOSTS        => $hosts,
-		   NEXT_HOST    => 0,
+		   PORT         => $args->{baseport},
 		   SERVER_ID    => 1,
 		  }, $class;
 

=== modified file 'mysql-test/lib/My/Handles.pm' (properties changed: +x to -x)
=== modified file 'mysql-test/lib/My/SafeProcess.pm'
--- mysql-test/lib/My/SafeProcess.pm	2010-04-28 12:52:24 +0000
+++ mysql-test/lib/My/SafeProcess.pm	2010-08-02 20:33:34 +0000
@@ -120,7 +120,7 @@
   my $input    = delete($opts{'input'});
   my $output   = delete($opts{'output'});
   my $error    = delete($opts{'error'});
-  my $verbose  = delete($opts{'verbose'});
+  my $verbose  = delete($opts{'verbose'}) || $::opt_verbose;
   my $nocore   = delete($opts{'nocore'});
   my $host     = delete($opts{'host'});
   my $shutdown = delete($opts{'shutdown'});
@@ -200,7 +200,7 @@
 
   # Call shutdown function if process has one, else
   # use kill
-  foreach my $proc (@processes){
+  foreach my $proc (@processes) {
     _verbose("  proc: $proc");
     my $shutdown= $proc->{SAFE_SHUTDOWN};
     if ($shutdown_timeout > 0 and defined $shutdown){

=== added file 'mysql-test/lib/My/Suite.pm'
--- mysql-test/lib/My/Suite.pm	1970-01-01 00:00:00 +0000
+++ mysql-test/lib/My/Suite.pm	2010-08-02 20:33:34 +0000
@@ -0,0 +1,7 @@
+package My::Suite;
+
+sub config_files { () }
+sub servers { () }
+
+bless { };
+

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- mysql-test/lib/mtr_cases.pm	2010-06-14 16:58:52 +0000
+++ mysql-test/lib/mtr_cases.pm	2010-08-02 20:33:34 +0000
@@ -39,7 +39,6 @@
 our $default_storage_engine;
 our $opt_with_ndbcluster_only;
 our $defaults_file;
-our $defaults_extra_file;
 our $quick_collect;
 
 sub collect_option {
@@ -71,6 +70,8 @@
 # If "Quick collect", set to 1 once a test to run has been found.
 my $some_test_found;
 
+my $default_suite_object = do 'My/Suite.pm';
+
 sub init_pattern {
   my ($from, $what)= @_;
   return undef unless defined $from;
@@ -295,6 +296,17 @@
   mtr_verbose("testdir: $testdir");
   mtr_verbose("resdir: $resdir");
 
+  #
+  # Load the Suite object
+  #
+  unless ($::suites{$suite}) {
+    if (-f "$suitedir/suite.pm") {
+      $::suites{$suite} = do "$suitedir/suite.pm";
+    } else {
+      $::suites{$suite} = $default_suite_object;
+    }
+  }
+
   # ----------------------------------------------------------------------
   # Build a hash of disabled testcases for this suite
   # ----------------------------------------------------------------------
@@ -743,7 +755,7 @@
      name          => "$suitename.$tname",
      shortname     => $tname,
      path          => "$testdir/$filename",
-
+     suite         => $suitename,
     );
 
   my $result_file= "$resdir/$tname.result";
@@ -1086,12 +1098,6 @@
     }
   }
 
-
-  # Set extra config file to use
-  if (defined $defaults_extra_file) {
-    $tinfo->{extra_template_path}= $defaults_extra_file;
-  }
-
   # ----------------------------------------------------------------------
   # Append mysqld extra options to both master and slave
   # ----------------------------------------------------------------------

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2010-06-14 17:01:20 +0000
+++ mysql-test/mysql-test-run.pl	2010-08-02 20:33:34 +0000
@@ -130,7 +130,7 @@
 # executables will be used by the test suite.
 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
-my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb,vcol,oqgraph";
+my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb,vcol,oqgraph,ndb";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
@@ -255,6 +255,8 @@
 
 our %mysqld_variables;
 
+our %suites;
+
 my $source_dist= 0;
 
 my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
@@ -805,7 +807,7 @@
       # We need to gracefully shut down the servers to see any
       # Valgrind memory leak errors etc. since last server restart.
       if ($opt_warnings) {
-        stop_servers(all_servers());
+        stop_servers(reverse servers());
         if(check_warnings_post_shutdown($server)) {
           # Warnings appeared in log file(s) during final server shutdown.
           exit(1);
@@ -1583,7 +1585,7 @@
   my $cmd= join(" ", $exe_mysqld, @$args);
   my $list= `$cmd`;
 
-  print "cmd: $cmd\n";
+  mtr_verbose("cmd: $cmd");
 
   foreach my $line (split('\n', $list))
   {
@@ -2471,7 +2473,7 @@
 }
 
 
-sub ndbcluster_wait_started($$){
+sub ndbcluster_wait_started {
   my $cluster= shift;
   my $ndb_waiter_extra_opt= shift;
   my $path_waitlog= join('/', $opt_vardir, $cluster->name(), "ndb_waiter.log");
@@ -2639,7 +2641,7 @@
 
 
 sub ndbcluster_start ($) {
-  my $cluster= shift;
+  my ($cluster) = @_;
 
   mtr_verbose("ndbcluster_start '".$cluster->name()."'");
 
@@ -2659,6 +2661,109 @@
 }
 
 
+sub mysql_server_start($) {
+  my ($mysqld, $tinfo) = @_;
+
+  if ( $mysqld->{proc} )
+  {
+    # Already started
+
+    # Write start of testcase to log file
+    mark_log($mysqld->value('#log-error'), $tinfo);
+
+    return;
+  }
+
+  my $datadir= $mysqld->value('datadir');
+  unless ($opt_start_dirty)
+  {
+
+    my @options= ('log-bin', 'relay-log');
+    foreach my $option_name ( @options )  {
+      next unless $mysqld->option($option_name);
+
+      my $file_name= $mysqld->value($option_name);
+      next unless
+        defined $file_name and
+          -e $file_name;
+
+      mtr_debug(" -removing '$file_name'");
+      unlink($file_name) or die ("unable to remove file '$file_name'");
+    }
+
+    if (-d $datadir ) {
+      preserve_error_log($mysqld);
+      mtr_verbose(" - removing '$datadir'");
+      rmtree($datadir);
+    }
+  }
+
+  my $mysqld_basedir= $mysqld->value('basedir');
+  if ( $basedir eq $mysqld_basedir )
+  {
+    if (! $opt_start_dirty)	# If dirty, keep possibly grown system db
+    {
+      # Copy datadir from installed system db
+      for my $path ( "$opt_vardir", "$opt_vardir/..") {
+        my $install_db= "$path/install.db";
+        copytree($install_db, $datadir)
+          if -d $install_db;
+      }
+      mtr_error("Failed to copy system db to '$datadir'")
+        unless -d $datadir;
+    }
+  }
+  else
+  {
+    mysql_install_db($mysqld); # For versional testing
+
+    mtr_error("Failed to install system db to '$datadir'")
+      unless -d $datadir;
+
+  }
+  restore_error_log($mysqld);
+
+  # Create the servers tmpdir
+  my $tmpdir= $mysqld->value('tmpdir');
+  mkpath($tmpdir) unless -d $tmpdir;
+
+  # Write start of testcase to log file
+  mark_log($mysqld->value('#log-error'), $tinfo);
+
+  # Run <tname>-master.sh
+  if ($mysqld->option('#!run-master-sh') and
+     run_sh_script($tinfo->{master_sh}) )
+  {
+    $tinfo->{'comment'}= "Failed to execute '$tinfo->{master_sh}'";
+    return 1;
+  }
+
+  # Run <tname>-slave.sh
+  if ($mysqld->option('#!run-slave-sh') and
+      run_sh_script($tinfo->{slave_sh}))
+  {
+    $tinfo->{'comment'}= "Failed to execute '$tinfo->{slave_sh}'";
+    return 1;
+  }
+
+  if (!$opt_embedded_server)
+  {
+    my $extra_opts= get_extra_opts($mysqld, $tinfo);
+    mysqld_start($mysqld,$extra_opts);
+
+    # Save this test case information, so next can examine it
+    $mysqld->{'started_tinfo'}= $tinfo;
+  }
+}
+
+sub mysql_server_wait {
+  my ($mysqld) = @_;
+
+  return not sleep_until_file_created($mysqld->value('pid-file'),
+                                      $opt_start_timeout,
+                                      $mysqld->{'proc'});
+}
+
 sub create_config_file_for_extern {
   my %opts=
     (
@@ -3082,7 +3187,7 @@
      path          => $exe_mysql,
      args          => \$args,
      output        => '/dev/null',
-     error         => '/dev/null'
+     error         => '/dev/null',
     );
 
   return $res
@@ -3436,6 +3541,75 @@
   return $tinfo->{timezone} || "DEFAULT";
 }
 
+sub mycnf_create {
+  my ($config) = @_;
+  my $res;
+
+  foreach my $group ($config->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";
+  }
+  $res;
+}
+
+sub config_files($) {
+  my ($tinfo) = @_;
+  (
+    'my.cnf' => \&mycnf_create,
+    $suites{$tinfo->{suite}}->config_files()
+  );
+}
+
+sub _like   { return $config ? $config->like($_[0]) : (); }
+sub mysqlds { return _like('mysqld.'); }
+sub ndbds   { return _like('cluster_config.ndbd.');}
+sub ndb_mgmds { return _like('cluster_config.ndb_mgmd.'); }
+
+sub fix_servers($) {
+  my ($tinfo) = @_;
+  return () unless $config;
+  my %servers = (
+    'mysqld.' => {
+      SORT => 300,
+      START => \&mysql_server_start,
+      WAIT => \&mysql_server_wait,
+    },
+    'mysql_cluster.' => {
+      SORT => 200,
+      START => \&ndbcluster_start,
+      WAIT => \&ndbcluster_wait_started,
+    },
+    'cluster_config.ndb_mgmd.' => {
+      SORT => 210,
+      START => undef,
+    },
+    'cluster_config.ndbd.' => {
+      SORT => 220,
+      START => undef,
+    },
+    $suites{$tinfo->{suite}}->servers()
+  );
+  for ($config->groups()) {
+    while (my ($re,$prop) = each %servers) {
+      @$_{'SORT','START'} = @$prop{'SORT','START'} if $_->{name} =~ /^$re/;
+    }
+  }
+}
+
+sub servers {
+  return unless $config;
+  ( sort { $a->{SORT} <=> $b->{SORT} }
+       grep { defined $_->{SORT} } $config->groups() );
+}
 
 # Storage for changed environment variables
 my %old_env;
@@ -3478,13 +3652,13 @@
     if ( @restart != 0) {
       # Remember that we restarted for this test case (count restarts)
       $tinfo->{'restarted'}= 1;
-      stop_servers(@restart );
+      stop_servers(reverse @restart);
       if ($opt_warnings) {
         check_warnings_post_shutdown($server_socket);
       }
     }
 
-    if ( started(all_servers()) == 0 )
+    if (started(servers()) == 0)
     {
 
       # Remove old datadirs
@@ -3514,7 +3688,6 @@
 	   vardir          => $opt_vardir,
 	   tmpdir          => $opt_tmpdir,
 	   baseport        => $baseport,
-	   #hosts          => [ 'host1', 'host2' ],
 	   user            => $opt_user,
 	   password        => '',
 	   ssl             => $opt_ssl_supported,
@@ -3522,8 +3695,16 @@
 	  }
 	);
 
-      # Write the new my.cnf
-      $config->save($path_config_file);
+      fix_servers($tinfo);
+
+      # Write config files:
+      my %config_files = config_files($tinfo);
+      while (my ($file, $generate) = each %config_files) {
+        my ($path) = "$opt_vardir/$file";
+        open (F, '>', $path) or die "Could not open '$path': $!";
+        print F &$generate($config);
+        close F;
+      }
 
       # Remember current config so a restart can occur when a test need
       # to use a different one
@@ -3561,7 +3742,7 @@
 
   if ( $start_only )
   {
-    mtr_print("\nStarted", started(all_servers()));
+    mtr_print("\nStarted", started(servers()));
     mtr_print("Using config for test", $tinfo->{name});
     mtr_print("Port and socket path for server(s):");
     foreach my $mysqld ( mysqlds() )
@@ -3577,7 +3758,7 @@
     }
     else {
       my $proc= My::SafeProcess->wait_any();
-      if ( grep($proc eq $_, started(all_servers())) )
+      if ( grep($proc eq $_, started(servers())) )
       {
         mtr_print("Server $proc died");
         exit(1);
@@ -3666,7 +3847,7 @@
             if ($opt_warnings) {
               # Checking error logs for warnings, so need to stop server
               # gracefully so that memory leaks etc. can be properly detected.
-              stop_servers(all_servers());
+              stop_servers(reverse servers());
               check_warnings_post_shutdown($server_socket);
               # Even if we got warnings here, we should not fail this
               # particular test, as the warnings may be caused by an earlier
@@ -3712,7 +3893,7 @@
 	# Wait a bit and see if a server died, if so report that instead
 	mtr_milli_sleep(100);
 	my $srvproc= My::SafeProcess::check_any();
-	if ($srvproc && grep($srvproc eq $_, started(all_servers()))) {
+	if ($srvproc && grep($srvproc eq $_, started(servers()))) {
 	  $proc= $srvproc;
 	  goto SRVDIED;
 	}
@@ -3760,7 +3941,7 @@
     # ----------------------------------------------------
     # Check if it was a server that died
     # ----------------------------------------------------
-    if ( grep($proc eq $_, started(all_servers())) )
+    if ( grep($proc eq $_, started(servers())) )
     {
       # Server failed, probably crashed
       $tinfo->{comment}=
@@ -3777,7 +3958,7 @@
     }
 
     # Try to dump core for mysqltest and all servers
-    foreach my $proc ($test, started(all_servers())) 
+    foreach my $proc ($test, started(servers())) 
     {
       mtr_print("Trying to dump core for $proc");
       if ($proc->dump_core())
@@ -3824,7 +4005,8 @@
 # valuable debugging information even if there is no test failure recorded.
 sub _preserve_error_log_names {
   my ($mysqld)= @_;
-  my $error_log_file= $mysqld->value('#log-error');
+  my $error_log_file= $mysqld->if_exist('#log-error');
+  return unless $error_log_file and -r $error_log_file;
   my $error_log_dir= dirname($error_log_file);
   my $save_name= $error_log_dir ."/../". $mysqld->name() .".error.log";
   return ($error_log_file, $save_name);
@@ -3833,14 +4015,14 @@
 sub preserve_error_log {
   my ($mysqld)= @_;
   my ($error_log_file, $save_name)= _preserve_error_log_names($mysqld);
-  my $res= rename($error_log_file, $save_name);
+  rename($error_log_file, $save_name) if $save_name;
   # Ignore any errors, as it's just a best-effort to keep the log if possible.
 }
 
 sub restore_error_log {
   my ($mysqld)= @_;
   my ($error_log_file, $save_name)= _preserve_error_log_names($mysqld);
-  my $res= rename($save_name, $error_log_file);
+  rename($save_name, $error_log_file) if $save_name;
 }
 
 # Keep track of last position in mysqld error log where we scanned for
@@ -3884,6 +4066,8 @@
 
 sub extract_server_log ($$) {
   my ($error_log, $tname) = @_;
+  
+  return unless $error_log;
 
   # Open the servers .err log file and read all lines
   # belonging to current test into @lines
@@ -3926,9 +4110,9 @@
   my ($proc, $name)= @_;
   my $srv_log= "";
 
-  foreach my $mysqld (mysqlds()) {
+  foreach my $mysqld (servers()) {
     if ($mysqld->{proc} eq $proc) {
-      my @srv_lines= extract_server_log($mysqld->value('#log-error'), $name);
+      my @srv_lines= extract_server_log($mysqld->if_exist('#log-error'), $name);
       $srv_log= "\nServer log from this test:\n" . join ("", @srv_lines);
       last;
     }
@@ -4007,6 +4191,7 @@
   my @antipatterns =
     (
      qr/error .*connecting to master/,
+     qr/Plugin 'ndbcluster' will be forced to shutdown/,
      qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/,
      qr/InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/,
      qr/Slave: Unknown table 't1' Error_code: 1051/,
@@ -4323,29 +4508,18 @@
 
 
 sub clean_datadir {
-
   mtr_verbose("Cleaning datadirs...");
 
-  if (started(all_servers()) != 0){
+  if (started(servers()) != 0) {
     mtr_error("Trying to clean datadir before all servers stopped");
   }
 
-  foreach my $cluster ( clusters() )
-  {
-    my $cluster_dir= "$opt_vardir/".$cluster->{name};
-    mtr_verbose(" - removing '$cluster_dir'");
-    rmtree($cluster_dir);
-
-  }
-
-  foreach my $mysqld ( mysqlds() )
-  {
-    my $mysqld_dir= dirname($mysqld->value('datadir'));
-    preserve_error_log($mysqld);
-    if (-d $mysqld_dir ) {
-      mtr_verbose(" - removing '$mysqld_dir'");
-      rmtree($mysqld_dir);
-    }
+  for (servers())
+  {
+    preserve_error_log($_); # or at least, try to
+    my $dir= "$opt_vardir/".$_->{name};
+    mtr_verbose(" - removing '$dir'");
+    rmtree($dir);
   }
 
   # Remove all files in tmp and var/tmp
@@ -4368,17 +4542,6 @@
 }
 
 
-sub remove_ndbfs_from_ndbd_datadir {
-  my ($ndbd_datadir)= @_;
-  # Remove the ndb_*_fs directory from ndbd.X/ dir
-  foreach my $ndbfs_dir ( glob("$ndbd_datadir/ndb_*_fs") )
-  {
-    next unless -d $ndbfs_dir; # Skip if not a directory
-    rmtree($ndbfs_dir);
-  }
-}
-
-
 sub after_failure ($) {
   my ($tinfo)= @_;
 
@@ -4395,31 +4558,18 @@
 
   mkpath($save_dir) if ! -d $save_dir;
 
-  # Save the used my.cnf file
-  copy($path_config_file, $save_dir);
+  # Save the used config files
+  my %config_files = config_files($tinfo);
+  while (my ($file, $generate) = each %config_files) {
+    copy("$opt_vardir/$file", $save_dir);
+  }
 
   # Copy the tmp dir
   copytree("$opt_vardir/tmp/", "$save_dir/tmp/");
 
-  if ( clusters() ) {
-    foreach my $cluster ( clusters() ) {
-      my $cluster_dir= "$opt_vardir/".$cluster->{name};
-
-      # Remove the fileystem of each ndbd
-      foreach my $ndbd ( in_cluster($cluster, ndbds()) )
-      {
-        my $ndbd_datadir= $ndbd->value("DataDir");
-        remove_ndbfs_from_ndbd_datadir($ndbd_datadir);
-      }
-
-      save_datadir_after_failure($cluster_dir, $save_dir);
-    }
-  }
-  else {
-    foreach my $mysqld ( mysqlds() ) {
-      my $data_dir= $mysqld->value('datadir');
-      save_datadir_after_failure(dirname($data_dir), $save_dir);
-    }
+  foreach (servers()) {
+    my $dir= "$opt_vardir/".$_->{name};
+    save_datadir_after_failure($dir, $save_dir);
   }
 }
 
@@ -4738,17 +4888,17 @@
 
   # Kill all started servers
   My::SafeProcess::shutdown($shutdown_timeout,
-			    started(all_servers()));
+			    started(servers()));
 
   # Remove pidfiles
-  foreach my $server ( all_servers() )
+  foreach my $server (servers())
   {
     my $pid_file= $server->if_exist('pid-file');
     unlink($pid_file) if defined $pid_file;
   }
 
   # Mark servers as stopped
-  map($_->{proc}= undef, all_servers());
+  map($_->{proc}= undef, servers());
 
 }
 
@@ -4810,8 +4960,7 @@
     return 1;
   }
 
-  my $is_mysqld= grep ($server eq $_, mysqlds());
-  if ($is_mysqld)
+  if ($server->name() =~ /^mysqld./)
   {
 
     # Check that running process was started with same options
@@ -4858,22 +5007,14 @@
 
 sub servers_need_restart($) {
   my ($tinfo)= @_;
-  return grep { server_need_restart($tinfo, $_); } all_servers();
+  return grep { server_need_restart($tinfo, $_); } servers();
 }
 
 
 
-#
-# Return list of specific servers
-#  - there is no servers in an empty config
-#
-sub _like   { return $config ? $config->like($_[0]) : (); }
-sub mysqlds { return _like('mysqld.'); }
-sub ndbds   { return _like('cluster_config.ndbd.');}
-sub ndb_mgmds { return _like('cluster_config.ndb_mgmd.'); }
-sub clusters  { return _like('mysql_cluster.'); }
-sub all_servers { return ( mysqlds(), ndb_mgmds(), ndbds() ); }
+############################################
 
+############################################
 
 #
 # Filter a list of servers and return only those that are part
@@ -4927,28 +5068,10 @@
 sub stop_servers($$) {
   my (@servers)= @_;
 
-  if ( join('|', @servers) eq join('|', all_servers()) )
-  {
-    # All servers are going down, use some kind of order to
-    # avoid too many warnings in the log files
-
-   mtr_report("Restarting all servers");
-
-    #  mysqld processes
-    My::SafeProcess::shutdown( $opt_shutdown_timeout, started(mysqlds()) );
-
-    # cluster processes
-    My::SafeProcess::shutdown( $opt_shutdown_timeout,
-			       started(ndbds(), ndb_mgmds()) );
-  }
-  else
-  {
-    mtr_report("Restarting ", started(@servers));
-
-     # Stop only some servers
-    My::SafeProcess::shutdown( $opt_shutdown_timeout,
-			       started(@servers) );
-  }
+  mtr_report("Restarting ", started(@servers));
+
+  My::SafeProcess::shutdown($opt_shutdown_timeout,
+                             started(@servers));
 
   foreach my $server (@servers)
   {
@@ -4975,145 +5098,14 @@
 sub start_servers($) {
   my ($tinfo)= @_;
 
-  # Start clusters
-  foreach my $cluster ( clusters() )
-  {
-    ndbcluster_start($cluster);
-  }
-
-  # Start mysqlds
-  foreach my $mysqld ( mysqlds() )
-  {
-    if ( $mysqld->{proc} )
-    {
-      # Already started
-
-      # Write start of testcase to log file
-      mark_log($mysqld->value('#log-error'), $tinfo);
-
-      next;
-    }
-
-    my $datadir= $mysqld->value('datadir');
-    if ($opt_start_dirty)
-    {
-      # Don't delete anything if starting dirty
-      ;
-    }
-    else
-    {
-
-      my @options= ('log-bin', 'relay-log');
-      foreach my $option_name ( @options )  {
-	next unless $mysqld->option($option_name);
-
-	my $file_name= $mysqld->value($option_name);
-	next unless
-	  defined $file_name and
-	    -e $file_name;
-
-	mtr_debug(" -removing '$file_name'");
-	unlink($file_name) or die ("unable to remove file '$file_name'");
-      }
-
-      if (-d $datadir ) {
-        preserve_error_log($mysqld);
-	mtr_verbose(" - removing '$datadir'");
-	rmtree($datadir);
-      }
-    }
-
-    my $mysqld_basedir= $mysqld->value('basedir');
-    if ( $basedir eq $mysqld_basedir )
-    {
-      if (! $opt_start_dirty)	# If dirty, keep possibly grown system db
-      {
-	# Copy datadir from installed system db
-	for my $path ( "$opt_vardir", "$opt_vardir/..") {
-	  my $install_db= "$path/install.db";
-	  copytree($install_db, $datadir)
-	    if -d $install_db;
-	}
-	mtr_error("Failed to copy system db to '$datadir'")
-	  unless -d $datadir;
-      }
-    }
-    else
-    {
-      mysql_install_db($mysqld); # For versional testing
-
-      mtr_error("Failed to install system db to '$datadir'")
-	unless -d $datadir;
-
-    }
-    restore_error_log($mysqld);
-
-    # Create the servers tmpdir
-    my $tmpdir= $mysqld->value('tmpdir');
-    mkpath($tmpdir) unless -d $tmpdir;
-
-    # Write start of testcase to log file
-    mark_log($mysqld->value('#log-error'), $tinfo);
-
-    # Run <tname>-master.sh
-    if ($mysqld->option('#!run-master-sh') and
-       run_sh_script($tinfo->{master_sh}) )
-    {
-      $tinfo->{'comment'}= "Failed to execute '$tinfo->{master_sh}'";
-      return 1;
-    }
-
-    # Run <tname>-slave.sh
-    if ($mysqld->option('#!run-slave-sh') and
-	run_sh_script($tinfo->{slave_sh}))
-    {
-      $tinfo->{'comment'}= "Failed to execute '$tinfo->{slave_sh}'";
-      return 1;
-    }
-
-    if (!$opt_embedded_server)
-    {
-      my $extra_opts= get_extra_opts($mysqld, $tinfo);
-      mysqld_start($mysqld,$extra_opts);
-
-      # Save this test case information, so next can examine it
-      $mysqld->{'started_tinfo'}= $tinfo;
-    }
-
-  }
-
-  # Wait for clusters to start
-  foreach my $cluster ( clusters() )
-  {
-    if (ndbcluster_wait_started($cluster, ""))
-    {
-      # failed to start
-      $tinfo->{'comment'}= "Start of '".$cluster->name()."' cluster failed";
-      return 1;
-    }
-  }
-
-  # Wait for mysqlds to start
-  foreach my $mysqld ( mysqlds() )
-  {
-    next if !started($mysqld);
-
-    if (sleep_until_file_created($mysqld->value('pid-file'),
-				 $opt_start_timeout,
-				 $mysqld->{'proc'}) == 0) {
-      $tinfo->{comment}=
-	"Failed to start ".$mysqld->name();
-
-      my $logfile= $mysqld->value('#log-error');
-      if ( defined $logfile and -f $logfile )
-      {
-        my @srv_lines= extract_server_log($logfile, $tinfo->{name});
-	$tinfo->{logfile}= "Server log is:\n" . join ("", @srv_lines);
-      }
-      else
-      {
-	$tinfo->{logfile}= "Could not open server logfile: '$logfile'";
-      }
+  for (servers()) {
+    $_->{START}->($_, $tinfo) if $_->{START};
+  }
+
+  for (servers()) {
+    next unless $_->{WAIT} and started($_);
+    if ($_->{WAIT}->($_, $tinfo)) {
+      $tinfo->{comment}= "Failed to start ".$_->name();
       return 1;
     }
   }

# Begin bundle
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
9E/8XckU4UJBFngnuA==