From 7cf53b1d89dd807ff0df238333f280bbc6567f0d Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 19 Dec 2007 14:21:09 +0100
Subject: [PATCH 01/26] Update path to master-bin file

---
 mysql-test/t/mysqlbinlog_base64.test | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test
index 9425fd3301d..71def6a733a 100644
--- a/mysql-test/t/mysqlbinlog_base64.test
+++ b/mysql-test/t/mysqlbinlog_base64.test
@@ -15,8 +15,9 @@ load data infile '../../std_data/words.dat' into table t2;
 #
 #  Save binlog
 #
+let $MYSQLD_DATADIR=`select @@datadir`;
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
 #  Clear database and restore from binlog
@@ -51,7 +52,7 @@ insert into t2 select * from t2;
 select count(*) from t2;
 
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
@@ -62,6 +63,6 @@ select count(*) from t2;
 #
 #  Test cleanup
 #
---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 drop table t1;
 drop table t2;

From 9087ee9170b6d1a5bfefadaedafeb7024e109fac Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Mon, 7 Jan 2008 19:44:48 +0100
Subject: [PATCH 02/26] Try to dynamically change option, restart if it fails

---
 mysql-test/lib/My/Options.pm | 191 +++++++++++++++++++++++++++++++++++
 mysql-test/lib/mtr_cases.pm  |  70 ++++++++-----
 mysql-test/lib/mtr_misc.pl   |  60 -----------
 mysql-test/lib/mtr_report.pl |   4 +-
 mysql-test/lib/t/Options.t   | 120 ++++++++++++++++++++++
 mysql-test/mysql-test-run.pl |  82 +++++++--------
 6 files changed, 403 insertions(+), 124 deletions(-)
 create mode 100644 mysql-test/lib/My/Options.pm
 create mode 100644 mysql-test/lib/t/Options.t

diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
new file mode 100644
index 00000000000..e79fc0fba9c
--- /dev/null
+++ b/mysql-test/lib/My/Options.pm
@@ -0,0 +1,191 @@
+# -*- 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
+
+
+package My::Options;
+
+#
+# Utility functions to work with list of options
+#
+
+use strict;
+
+
+sub same($$) {
+  my $l1= shift;
+  my $l2= shift;
+  return compare($l1,$l2) == 0;
+}
+
+
+sub compare ($$) {
+  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
+}
+
+
+sub _split_option {
+  my ($option)= @_;
+  if ($option=~ /^--(.*)=(.*)$/){
+    return ($1, $2);
+  }
+  elsif ($option=~ /^--(.*)$/){
+    return ($1, undef)
+  }
+  elsif ($option=~ /^(.*)=(.*)$/){
+    return ($1, $2)
+  }
+  elsif ($option=~ /^-O$/){
+    return (undef, undef);
+  }
+  die "Unknown option format '$option'";
+}
+
+
+sub _build_option {
+  my ($name, $value)= @_;
+  if ($name =~ /^O, /){
+    return "-".$name."=".$value;
+  }
+  elsif ($value){
+    return "--".$name."=".$value;
+  }
+  return "--".$name;
+}
+
+
+#
+# Compare two list of options and return what would need
+# to be done to get the server running with the new settings
+#
+sub diff {
+  my ($from_opts, $to_opts)= @_;
+
+  my %from;
+  foreach my $from (@$from_opts)
+  {
+    my ($opt, $value)= _split_option($from);
+    next unless defined($opt);
+    $from{$opt}= $value;
+  }
+
+  #print "from: ", %from, "\n";
+
+  my %to;
+  foreach my $to (@$to_opts)
+  {
+    my ($opt, $value)= _split_option($to);
+    next unless defined($opt);
+    $to{$opt}= $value;
+  }
+
+  #print "to: ", %to, "\n";
+
+  # Remove the ones that are in both lists
+  foreach my $name (keys %from){
+    if (exists $to{$name} and $to{$name} eq $from{$name}){
+      #print "removing '$name'  from both lists\n";
+      delete $to{$name};
+      delete $from{$name};
+    }
+  }
+
+  #print "from: ", %from, "\n";
+  #print "to: ", %to, "\n";
+
+  # Add all keys in "to" to result
+  my @result;
+  foreach my $name (keys %to){
+    push(@result, _build_option($name, $to{$name}));
+  }
+
+  # Add all keys in "from" that are not in "to"
+  # to result as "set to default"
+  foreach my $name (keys %from){
+    if (not exists $to{$name}) {
+      push(@result, _build_option($name, "default"));
+    }
+  }
+
+  return @result;
+}
+
+
+sub is_set {
+  my ($opts, $set_opts)= @_;
+
+  foreach my $opt (@$opts){
+
+    my ($opt_name1, $value1)= _split_option($opt);
+
+    foreach my $set_opt (@$set_opts){
+      my ($opt_name2, $value2)= _split_option($set_opt);
+
+      if ($opt_name1 eq $opt_name2){
+	# Option already set
+	return 1;
+      }
+    }
+  }
+
+  return 0;
+}
+
+
+sub toSQL {
+  my (@options)= @_;
+  my @sql;
+
+  foreach my $option (@options) {
+    my ($name, $value)= _split_option($option);
+    #print "name: $name\n";
+    if ($name =~ /^O, (.*)/){
+      push(@sql, "SET GLOBAL $1=$value");
+    } else {
+      my $sql_name= $name;
+      $sql_name=~ s/-/_/g;
+      push(@sql, "SET GLOBAL $sql_name=$value");
+    }
+  }
+  return join("; ", @sql);
+}
+
+
+sub toStr {
+  my $name= shift;
+  return "$name: ",
+    "['", join("', '", @_), "']\n";
+}
+
+
+1;
+
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 4d6885f5495..1687b0df47e 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -31,7 +31,7 @@ our $skip_rpl;
 our $do_test;
 our $skip_test;
 our $opt_skip_combination;
-our $binlog_format;;
+our $binlog_format;
 our $enable_disabled;
 our $default_storage_engine;
 our $opt_with_ndbcluster_only;
@@ -83,8 +83,9 @@ sub init_pattern {
 #
 ##############################################################################
 
-sub collect_test_cases ($) {
+sub collect_test_cases ($$) {
   my $suites= shift; # Semicolon separated list of test suites
+  my $opt_cases= shift;
   my $cases= []; # Array of hash(one hash for each testcase)
 
   $do_test_reg= init_pattern($do_test, "--do-test");
@@ -92,15 +93,15 @@ sub collect_test_cases ($) {
 
   foreach my $suite (split(",", $suites))
   {
-    push(@$cases, collect_one_suite($suite));
+    push(@$cases, collect_one_suite($suite, $opt_cases));
   }
 
-  if ( @::opt_cases )
+  if ( @$opt_cases )
   {
     # A list of tests was specified on the command line
     # Check that the tests specified was found
     # in at least one suite
-    foreach my $test_name_spec ( @::opt_cases )
+    foreach my $test_name_spec ( @$opt_cases )
     {
       my $found= 0;
       my ($sname, $tname, $extension)= split_testname($test_name_spec);
@@ -236,6 +237,7 @@ sub split_testname {
 sub collect_one_suite($)
 {
   my $suite= shift;  # Test suite name
+  my $opt_cases= shift;
   my @cases; # Array of hash
 
   mtr_verbose("Collecting: $suite");
@@ -304,10 +306,10 @@ sub collect_one_suite($)
     $suite_opts= opts_from_file($suite_opt_file);
   }
 
-  if ( @::opt_cases )
+  if ( @$opt_cases )
   {
     # Collect in specified order
-    foreach my $test_name_spec ( @::opt_cases )
+    foreach my $test_name_spec ( @$opt_cases )
     {
       my ($sname, $tname, $extension)= split_testname($test_name_spec);
 
@@ -428,9 +430,15 @@ sub collect_one_suite($)
       {
 	foreach my $test (@cases)
 	{
-	  #print $test->{name}, " ", $comb, "\n";
-	  my $new_test= {};
+	  # Skip this combination if the values it provides
+	  # already are set in master_opt or slave_opt
+	  if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) &&
+	      My::Options::is_set($test->{slave_opt}, $comb->{comb_opt}) ){
+	    next;
+	  }
 
+	  # Copy test options
+	  my $new_test= {};
 	  while (my ($key, $value) = each(%$test)) {
 	    if (ref $value eq "ARRAY") {
 	      push(@{$new_test->{$key}}, @$value);
@@ -450,6 +458,18 @@ sub collect_one_suite($)
 	  push(@new_cases, $new_test);
 	}
       }
+
+      # Add the plain test if it was not already added
+      # as part of a combination
+      my %added;
+      foreach my $new_test (@new_cases){
+	$added{$new_test->{name}}= 1;
+      }
+      foreach my $test (@cases){
+	push(@new_cases, $test) unless $added{$test->{name}};
+      }
+
+
       #print_testcases(@new_cases);
       @cases= @new_cases;
       #print_testcases(@cases);
@@ -481,6 +501,7 @@ sub optimize_cases {
     # --mysqld=--binlog-format=x, skip all test that does not
     # support it
     # =======================================================
+    #print "binlog_format: $binlog_format\n";
     if (defined $binlog_format )
     {
       # =======================================================
@@ -488,6 +509,8 @@ sub optimize_cases {
       # =======================================================
       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=
@@ -513,23 +536,18 @@ sub optimize_cases {
 	  mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format;
       }
 
-      if (defined $test_binlog_format)
+      if (defined $test_binlog_format and
+	  defined $tinfo->{binlog_formats} )
       {
-	if ( defined $tinfo->{binlog_formats} )
+	my $supported=
+	  grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}};
+	if ( !$supported )
 	{
-	  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;
-	  }
+	  $tinfo->{'skip'}= 1;
+	  $tinfo->{'comment'}=
+	    "Doesn't support --binlog-format='$test_binlog_format'";
+	  next;
 	}
-
-	# Save binlog format for dynamic switching
-	$tinfo->{binlog_format_switch}= $test_binlog_format;
       }
     }
   }
@@ -882,6 +900,12 @@ sub collect_one_test_case {
     $tinfo->{extra_template_path}= $defaults_extra_file;
   }
 
+  # ----------------------------------------------------------------------
+  # Append mysqld extra options to both master and slave
+  # ----------------------------------------------------------------------
+  push(@{$tinfo->{'master_opt'}}, @::opt_extra_mysqld_opt);
+  push(@{$tinfo->{'slave_opt'}}, @::opt_extra_mysqld_opt);
+
   return $tinfo;
 }
 
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
index 3c1d60fd6ab..759ad6da3bc 100644
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -29,8 +29,6 @@ sub mtr_script_exists(@);
 sub mtr_file_exists(@);
 sub mtr_exe_exists(@);
 sub mtr_exe_maybe_exists(@);
-sub mtr_same_opts($$);
-sub mtr_cmp_opts($$);
 
 ##############################################################################
 #
@@ -189,35 +187,6 @@ sub mtr_exe_exists (@) {
 }
 
 
-
-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
-}
-
-
 sub mtr_milli_sleep {
   die "usage: mtr_milli_sleep(milliseconds)" unless @_ == 1;
   my ($millis)= @_;
@@ -225,33 +194,4 @@ sub mtr_milli_sleep {
   select(undef, undef, undef, ($millis/1000));
 }
 
-#
-# Compare two arrays and put all unequal elements into a new one
-#
-sub mtr_diff_opts ($$) {
-  my $l1= shift;
-  my $l2= shift;
-  my $found;
-  my @result;
-  foreach my $e1 (@$l1)
-  {
-    $found= undef;
-    foreach my $e2 (@$l2)
-    {
-      $found= 1 unless ($e1 ne $e2);
-    }
-    push(@result, $e1) unless (defined $found);
-  }
-  foreach my $e2 (@$l2)
-  {
-    $found= undef;
-    foreach my $e1 (@$l1)
-    {
-      $found= 1 unless ($e1 ne $e2);
-    }
-    push(@result, $e2) unless (defined $found);
-  }
-  return @result;
-}
-
 1;
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index f3b950e4d3a..61a698f4123 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -68,7 +68,9 @@ sub mtr_report_test_skipped ($) {
     if ( $tinfo->{skip_detected_by_test} )
     {
       mtr_report("[ skip.]  $tinfo->{'comment'}");
-    } else {
+    }
+    else
+    {
       mtr_report("[ skip ]  $tinfo->{'comment'}");
     }
   }
diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t
new file mode 100644
index 00000000000..e48999cd99b
--- /dev/null
+++ b/mysql-test/lib/t/Options.t
@@ -0,0 +1,120 @@
+# -*- cperl -*-
+use Test::More qw(no_plan);
+use strict;
+
+use_ok("My::Options");
+
+my @tests=
+(
+  [
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=ms'],
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'],
+   ['--binlog-format=statement']
+  ],
+
+  [
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'],
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=mixed'],
+   ['--binlog-format=mixed']
+  ],
+
+  [
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=mixed'],
+   ['--binlog-format=row', '--loose-skip-innodb', '--binlog-format=statement'],
+   ['--binlog-format=statement']
+  ],
+
+  [
+   ['--binlog-format=mixed', '--loose-skip-innodb', '--binlog-format=row'],
+   ['--binlog-format=statement', '--loose-skip-innodb', '--binlog-format=row'],
+   [ ]
+  ],
+
+  [
+   ['--binlog-format=row'],
+   [ ],
+   ['--binlog-format=default']
+  ],
+
+  [
+   [ ],
+   ['--binlog-format=row'],
+   ['--binlog-format=row']
+  ],
+
+  [
+   [ ],
+   ['-O', 'max_binlog_size=1' ],
+   ['--max_binlog_size=1' ]
+  ],
+
+  [
+   ['-O', 'max_binlog_size=1' ],
+   ['-O', 'max_binlog_size=1' ],
+   [ ],
+  ],
+
+  [
+   ['-O', 'max_binlog_size=1' ],
+   [ ],
+   ['--max_binlog_size=default' ]
+  ],
+
+  [
+   [ ],
+   ['-O', 'max_binlog_size=1', '--binlog-format=row' ],
+   ['--max_binlog_size=1', '--binlog-format=row' ]
+  ],
+  [
+   ['--binlog-format=statement' ],
+   ['-O', 'max_binlog_size=1', '--binlog-format=row' ],
+   ['--max_binlog_size=1', '--binlog-format=row']
+  ],
+
+  [
+   [ '--binlog-format=statement' ],
+   ['-O', 'max_binlog_size=1', '--binlog-format=statement' ],
+   ['--max_binlog_size=1' ]
+  ],
+
+ [
+   [ '--binlog-format=statement' ],
+   ['-O', 'max_binlog_size=1', '--binlog-format=statement' ],
+   ['--max_binlog_size=1' ]
+ ],
+
+ [
+  [ '--binlog-format=statement' ],
+  ['--relay-log=/path/to/a/relay-log', '--binlog-format=row'],
+  ['--relay-log=/path/to/a/relay-log', '--binlog-format=row' ]
+ ],
+
+
+ [
+  [ '--binlog-format=statement' ],
+  ['--relay-log=/path/to/a/relay-log', '-O', 'max_binlog_size=1'],
+  ['--max_binlog_size=1', '--relay-log=/path/to/a/relay-log', '--binlog-format=default' ]
+ ],
+
+
+);
+
+
+my $test_no= 0;
+foreach my $test (@tests){
+  print "test", $test_no++, "\n";
+  foreach my $opts (@$test){
+    print My::Options::toStr("", @$opts);
+  }
+  my $from= $test->[0];
+  my $to= $test->[1];
+  my @result= My::Options::diff($from, $to);
+  ok(My::Options::same(\@result, $test->[2]));
+  if (!My::Options::same(\@result, $test->[2])){
+    print "failed\n";
+    print My::Options::toStr("result", @result);
+    print My::Options::toStr("expect", @{$test->[2]});
+  }
+  print My::Options::toSQL(@result), "\n";
+  print "\n";
+}
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ce0fe4c8a2b..4eda93fb664 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -48,6 +48,7 @@ use File::Copy;
 use File::Temp qw / tempdir /;
 use My::SafeProcess;
 use My::ConfigFactory;
+use My::Options;
 use mtr_cases;
 
 our $is_win32_perl=  ($^O eq "MSWin32"); # ActiveState Win32 Perl
@@ -230,7 +231,7 @@ sub main {
 
   # Figure out which tests we are going to run
   mtr_report("Collecting tests...");
-  my $tests= collect_test_cases($opt_suites);
+  my $tests= collect_test_cases($opt_suites, \@opt_cases);
 
   initialize_servers();
 
@@ -2075,28 +2076,29 @@ sub run_testcase_check_skip_test($)
 }
 
 
-sub dynamic_binlog_format_switch {
-  my ($tinfo, $mysqld)= @_;
+sub run_query {
+  my ($tinfo, $mysqld, $query)= @_;
 
-  my $sql= "include/set_binlog_format_".$tinfo->{binlog_format_switch}.".sql";
   my $args;
   mtr_init_args(\$args);
   mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
   mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
+
+  mtr_add_arg($args, "-e %s", $query);
+
   my $res= My::SafeProcess->run
     (
-     name          => "switch binlog format ".$mysqld->name(),
+     name          => "run_query -> ".$mysqld->name(),
      path          => $exe_mysql,
      args          => \$args,
-     input         => $sql,
+     output        => '/dev/null',
+     error         => '/dev/null'
     );
 
-  if ($res != 0)
-  {
-    mtr_error("Failed to switch binlog format");
-  }
+  return $res
 }
 
+
 sub do_before_run_mysqltest($)
 {
   my $tinfo= shift;
@@ -2570,7 +2572,7 @@ sub mysqld_stop {
 sub mysqld_arguments ($$$) {
   my $args=              shift;
   my $mysqld=            shift;
-  my $extra_opt=         shift;
+  my $extra_opts=        shift;
 
   my $prefix= "";               # If mysqltest server arg
   if ( $opt_embedded_server )
@@ -2585,7 +2587,7 @@ sub mysqld_arguments ($$$) {
   # to start unless we specify what user to run as, see BUG#30630
   my $euid= $>;
   if (!$is_win32 and $euid == 0 and
-      (grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) {
+      (grep(/^--user/, @$extra_opts)) == 0) {
     mtr_add_arg($args, "%s--user=root", $prefix);
   }
 
@@ -2606,8 +2608,7 @@ sub mysqld_arguments ($$$) {
   }
 
   # Check if "extra_opt" contains skip-log-bin
-  my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/,
-			@$extra_opt, @opt_extra_mysqld_opt);
+  my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts);
 
   if ( $opt_debug )
   {
@@ -2622,7 +2623,7 @@ sub mysqld_arguments ($$$) {
   }
 
   my $found_skip_core= 0;
-  foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
+  foreach my $arg ( @$extra_opts )
   {
     # Allow --skip-core-file to be set in <testname>-[master|slave].opt file
     if ($arg eq "--skip-core-file")
@@ -2651,9 +2652,12 @@ sub mysqld_arguments ($$$) {
 }
 
 
+
 sub mysqld_start ($$) {
   my $mysqld=            shift;
-  my $extra_opt=         shift;
+  my $extra_opts=        shift;
+
+  mtr_verbose(My::Options::toStr("mysqld_start", @$extra_opts));
 
   my $exe= $exe_mysqld;
   my $wait_for_pid_file= 1;
@@ -2669,7 +2673,7 @@ sub mysqld_start ($$) {
     valgrind_arguments($args, \$exe);
   }
 
-  mysqld_arguments($args,$mysqld,$extra_opt);
+  mysqld_arguments($args,$mysqld,$extra_opts);
 
   if ( $opt_gdb || $opt_manual_gdb )
   {
@@ -2738,7 +2742,7 @@ sub mysqld_start ($$) {
   }
 
   # Remember options used when starting
-  $mysqld->{'started_opts'}= $extra_opt;
+  $mysqld->{'started_opts'}= $extra_opts;
 
   return;
 }
@@ -2758,7 +2762,6 @@ sub stop_all_servers () {
 }
 
 
-
 # Find out if server should be restarted for this test
 sub server_need_restart {
   my ($tinfo, $server)= @_;
@@ -2811,35 +2814,34 @@ sub server_need_restart {
     }
   }
 
-  my $is_mysqld=  grep ($server eq $_, mysqlds());
+  my $is_mysqld= grep ($server eq $_, mysqlds());
   if ($is_mysqld)
   {
 
     # Check that running process was started with same options
     # as the current test requires
-    my $extra_opt= get_extra_opt($server, $tinfo);
+    my $extra_opts= get_extra_opts($server, $tinfo);
     my $started_opts= $server->{'started_opts'};
-    if (defined $started_opts and $extra_opt and
-	! mtr_same_opts($started_opts, $extra_opt) )
-    {
-      # TODO Use a list  to find all options that can be set dynamically
 
-      # Check if diff is binlog format only
-      # and the next test has $binlog_format_switch set
-      my @diff_opts= mtr_diff_opts($started_opts, $extra_opt);
-      if (@diff_opts == 2 and
-	  $diff_opts[0] =~/^--binlog-format=/ and
-	  $diff_opts[1] =~/^--binlog-format=/ and
-	  defined $tinfo->{binlog_format_switch})
-      {
-	mtr_verbose("Using dynamic switch of binlog format from ",
-		    $diff_opts[0],"to", $diff_opts[1]);
-	dynamic_binlog_format_switch($tinfo, $server);
+    if (!My::Options::same($started_opts, $extra_opts) )
+    {
+      mtr_verbose(My::Options::toStr("started_opts", @$started_opts));
+      mtr_verbose(My::Options::toStr("extra_opts", @$extra_opts));
+
+      # Get diff and check if dynamic switch is possible
+      my @diff_opts= My::Options::diff($started_opts, $extra_opts);
+      mtr_verbose(My::Options::toStr("diff_opts", @diff_opts));
+
+      my $query= My::Options::toSQL(@diff_opts);
+      mtr_verbose("Attempting dynamic switch '$query'");
+      if (run_query($tinfo, $server, $query)){
+	mtr_verbose("Restart: Dynamic switch failed");
+	return 1;
       }
       else
       {
 	mtr_verbose("Restart: running with different options '" .
-		    join(" ", @{$extra_opt}) . "' != '" .
+		    join(" ", @{$extra_opts}) . "' != '" .
 		    join(" ", @{$server->{'started_opts'}}) . "'" );
 	return 1;
       }
@@ -2890,7 +2892,7 @@ sub started { return grep(defined $_, map($_->{proc}, @_));  }
 sub stopped { return grep(!defined $_, map($_->{proc}, @_)); }
 
 
-sub get_extra_opt {
+sub get_extra_opts {
   my ($mysqld, $tinfo)= @_;
 
   return
@@ -3026,8 +3028,8 @@ sub start_servers($) {
       return 1;
     }
 
-    my $extra_opt= get_extra_opt($mysqld, $tinfo);
-    mysqld_start($mysqld,$extra_opt);
+    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;

From ec673b8a9780fe125445cd3aa30619708080822e Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 10:35:34 +0100
Subject: [PATCH 03/26] Use loose-skip-innodb so it works also with mysqld that
 has no innodb support

---
 mysql-test/suite/rpl_ndb/my.cnf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/suite/rpl_ndb/my.cnf b/mysql-test/suite/rpl_ndb/my.cnf
index b37b163afee..58fec36eedd 100644
--- a/mysql-test/suite/rpl_ndb/my.cnf
+++ b/mysql-test/suite/rpl_ndb/my.cnf
@@ -52,7 +52,7 @@ report-host=                  127.0.0.1
 report-port=                  @mysqld.1.slave.port
 report-user=                  root
 
-skip-innodb
+loose-skip-innodb
 skip-slave-start
 
 # Directory where slaves find the dumps generated by "load data"

From 3b2cfef63756c804d519f95146aa20f5fdbe88bf Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 10:50:07 +0100
Subject: [PATCH 04/26] Use a tempdir name for the directory that var symlink
 points at, otherwise it can conflict with another MTR_BUILD_THREAD=auto run

---
 mysql-test/mysql-test-run.pl | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4eda93fb664..a4cf7b41310 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -539,7 +539,7 @@ sub command_line_setup {
       if $opt_tmpdir;
 
     # Search through list of locations that are known
-    # to be "fast disks" to list to find a suitable location
+    # to be "fast disks" to find a suitable location
     # Use --mem=<dir> as first location to look.
     my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");
 
@@ -547,8 +547,8 @@ sub command_line_setup {
     {
       if ( -d $fs )
       {
-	$opt_mem= "$fs/var";
-	$opt_mem .= $opt_mtr_build_thread if $opt_mtr_build_thread;
+	my $template= "var_${opt_mtr_build_thread}_XXXX";
+	$opt_mem= tempdir( $template, DIR => $fs, CLEANUP => 0);
 	last;
       }
     }
@@ -772,7 +772,6 @@ sub set_mtr_build_thread_ports($) {
       mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
     print "got ".$mtr_build_thread."\n";
   }
-  $opt_mtr_build_thread= $mtr_build_thread;
   $ENV{MTR_BUILD_THREAD}= $mtr_build_thread;
 
   # Calculate baseport
@@ -1272,7 +1271,7 @@ sub remove_stale_vardir () {
     {
       # var is a symlink
 
-      if ( $opt_mem and readlink($opt_vardir) eq $opt_mem )
+      if ( $opt_mem )
       {
 	# Remove the directory which the link points at
 	mtr_verbose("Removing " . readlink($opt_vardir));
@@ -1282,14 +1281,6 @@ sub remove_stale_vardir () {
 	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

From 03d31f72a0a51b314e442d92aa40eef545dbdb0a Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 11:11:06 +0100
Subject: [PATCH 05/26] Remove pidfile after killing serve

---
 mysql-test/mysql-test-run.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index a4cf7b41310..09b66ee4521 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2747,6 +2747,13 @@ sub stop_all_servers () {
   My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill
 			    started(all_servers()));
 
+  # Remove pidfiles
+  foreach my $server ( all_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());
 

From 5c1dba67e5c4307a3af7020ae5c6195846658561 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 15:24:17 +0100
Subject: [PATCH 06/26] Use "diif --help" to find out if diff is available at
 all. Otherwise the return code from "could not find command" which is 1,
 conflicts with return code from diff failed, which is also 1.

---
 client/mysqltest.c | 71 ++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 9af0c93d186..39675a168d9 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1313,42 +1313,64 @@ void show_diff(DYNAMIC_STRING* ds,
                const char* filename1, const char* filename2)
 {
 
+  const char* diff_failed= 0;
   DYNAMIC_STRING ds_tmp;
 
   if (init_dynamic_string(&ds_tmp, "", 256, 256))
     die("Out of memory");
 
-  /* First try with unified diff */
+  /* First try with diff --help to see if the command exists at all */
   if (run_tool("diff",
                &ds_tmp, /* Get output from diff in ds_tmp */
-               "-u",
-               filename1,
-               filename2,
+               "--help",
                "2>&1",
-               NULL) > 1) /* Most "diff" tools return >1 if error */
+               NULL) != 0) /* Most "diff --help" tools return 0 */
+  {
+    diff_failed= "You don't appear to have diff installed";
+  }
+  else
   {
-    dynstr_set(&ds_tmp, "");
 
-    /* Fallback to context diff with "diff -c" */
+    /* First try with unified diff */
+
     if (run_tool("diff",
                  &ds_tmp, /* Get output from diff in ds_tmp */
-                 "-c",
+                 "-u",
                  filename1,
                  filename2,
                  "2>&1",
                  NULL) > 1) /* Most "diff" tools return >1 if error */
     {
-      /*
-        Fallback to dump both files to result file and inform
-        about installing "diff"
-      */
       dynstr_set(&ds_tmp, "");
 
-      dynstr_append(&ds_tmp,
+      /* Fallback to context diff with "diff -c" */
+      if (run_tool("diff",
+                   &ds_tmp, /* Get output from diff in ds_tmp */
+                   "-c",
+                   filename1,
+                   filename2,
+                   "2>&1",
+                   NULL) > 1) /* Most "diff" tools return >1 if error */
+      {
+        dynstr_set(&ds_tmp, "");
+        diff_failed= "Could not execute 'diff -u' or 'diff -c'";
+      }
+    }
+  }
+
+  if (diff_failed)
+  {
+    /*
+      Fallback to dump both files to result file and inform
+      about installing "diff"
+    */
+	dynstr_append(&ds_tmp, "\n");
+    dynstr_append(&ds_tmp, diff_failed);
+    dynstr_append(&ds_tmp,
 "\n"
 "The two files differ but it was not possible to execute 'diff' in\n"
-"order to show only the difference, tried both 'diff -u' or 'diff -c'.\n"
-"Instead the whole content of the two files was shown for you to diff manually. ;)\n\n"
+"order to show only the difference. Instead the whole content of the\n"
+"two files was shown for you to diff manually.\n\n"
 "To get a better report you should install 'diff' on your system, which you\n"
 "for example can get from http://www.gnu.org/software/diffutils/diffutils.html\n"
 #ifdef __WIN__
@@ -1356,16 +1378,15 @@ void show_diff(DYNAMIC_STRING* ds,
 #endif
 "\n");
 
-      dynstr_append(&ds_tmp, " --- ");
-      dynstr_append(&ds_tmp, filename1);
-      dynstr_append(&ds_tmp, " >>>\n");
-      cat_file(&ds_tmp, filename1);
-      dynstr_append(&ds_tmp, "<<<\n --- ");
-      dynstr_append(&ds_tmp, filename1);
-      dynstr_append(&ds_tmp, " >>>\n");
-      cat_file(&ds_tmp, filename2);
-      dynstr_append(&ds_tmp, "<<<<\n");
-    }
+    dynstr_append(&ds_tmp, " --- ");
+    dynstr_append(&ds_tmp, filename1);
+    dynstr_append(&ds_tmp, " >>>\n");
+    cat_file(&ds_tmp, filename1);
+    dynstr_append(&ds_tmp, "<<<\n --- ");
+    dynstr_append(&ds_tmp, filename1);
+    dynstr_append(&ds_tmp, " >>>\n");
+    cat_file(&ds_tmp, filename2);
+    dynstr_append(&ds_tmp, "<<<<\n");
   }
 
   if (ds)

From 5a026a867951f6feb1538812c6a58b16963ab559 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 15:45:47 +0100
Subject: [PATCH 07/26] Force restart before events_restart_phase2

---
 mysql-test/t/events_restart_phase2-master.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/events_restart_phase2-master.opt b/mysql-test/t/events_restart_phase2-master.opt
index 673e87f4357..b60aeb8d9b3 100644
--- a/mysql-test/t/events_restart_phase2-master.opt
+++ b/mysql-test/t/events_restart_phase2-master.opt
@@ -1 +1 @@
---event-scheduler=on
+--event-scheduler=on --force-restart

From 284f28d78fa954c6a38e3e16e903e75d77fbfd2a Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 15:47:04 +0100
Subject: [PATCH 08/26] Remember dynamically set options as started

---
 mysql-test/lib/My/Options.pm | 7 ++++++-
 mysql-test/mysql-test-run.pl | 8 +++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
index e79fc0fba9c..f0fc4ba75b5 100644
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@@ -168,9 +168,14 @@ sub toSQL {
   foreach my $option (@options) {
     my ($name, $value)= _split_option($option);
     #print "name: $name\n";
+    #print "value: $value\n";
     if ($name =~ /^O, (.*)/){
       push(@sql, "SET GLOBAL $1=$value");
-    } else {
+    }
+    elsif ($name =~ /^set-variable=(.*)/){
+      push(@sql, "SET GLOBAL $1=$value");
+    }
+    else {
       my $sql_name= $name;
       $sql_name=~ s/-/_/g;
       push(@sql, "SET GLOBAL $sql_name=$value");
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 09b66ee4521..b6080538a61 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2833,16 +2833,14 @@ sub server_need_restart {
       my $query= My::Options::toSQL(@diff_opts);
       mtr_verbose("Attempting dynamic switch '$query'");
       if (run_query($tinfo, $server, $query)){
-	mtr_verbose("Restart: Dynamic switch failed");
-	return 1;
-      }
-      else
-      {
 	mtr_verbose("Restart: running with different options '" .
 		    join(" ", @{$extra_opts}) . "' != '" .
 		    join(" ", @{$server->{'started_opts'}}) . "'" );
 	return 1;
       }
+
+      # Remember the dynamically set options
+      $server->{'started_opts'}= $extra_opts;
     }
   }
 

From 14aaab792d7cf2d51e935bc9835cac26b3a1ef9e Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 15:48:55 +0100
Subject: [PATCH 09/26] Fix spelling

---
 mysql-test/mysql-test-run.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 09b66ee4521..09a9b2cbcd2 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -783,7 +783,7 @@ sub set_mtr_build_thread_ports($) {
               "($opt_baseport - $opt_baseport + 9)");
   }
 
-  mtr_report("Using MR_BUILD_THREAD $opt_mtr_build_thread,",
+  mtr_report("Using MR_BUILD_THREAD $mtr_build_thread,",
 	     "with reserved ports $opt_baseport..".($opt_baseport+9));
 
 }

From d610b72159a6cc2f5ae22b7ca27799723f44e680 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 21:13:25 +0100
Subject: [PATCH 10/26] Check for windows patch to convert also in --replace

---
 client/mysqltest.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 39675a168d9..628a4e639fd 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -7406,6 +7406,7 @@ void do_get_replace(struct st_command *command)
     if (!*from)
       die("Wrong number of arguments to replace_result in '%s'",
           command->query);
+    IF_WIN(fix_win_paths(to, from - to), 0);
     insert_pointer_name(&from_array,to);
     to= get_string(&buff, &from, command);
     insert_pointer_name(&to_array,to);
@@ -8596,9 +8597,7 @@ void free_pointer_array(POINTER_ARRAY *pa)
 void replace_dynstr_append_mem(DYNAMIC_STRING *ds,
                                const char *val, int len)
 {
-#ifdef __WIN__
-  fix_win_paths(val, len);
-#endif
+  IF_WIN(fix_win_paths(val, len), 0);
 
   if (glob_replace_regex)
   {

From 29a9df427891d82212e1f91cad9c2c6a67b34508 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 21:23:30 +0100
Subject: [PATCH 11/26] Clear ds_tmp after running "diff --help"

---
 client/mysqltest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 628a4e639fd..ad9e7452430 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1330,7 +1330,7 @@ void show_diff(DYNAMIC_STRING* ds,
   }
   else
   {
-
+    dynstr_set(&ds_tmp, "");
     /* First try with unified diff */
 
     if (run_tool("diff",

From f3a95344121394d35d82815890d19b003b83f556 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 21:26:55 +0100
Subject: [PATCH 12/26] Skipp adding combinations for test tat already are
 skipped

---
 mysql-test/lib/mtr_cases.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 1687b0df47e..5e07c01bf7f 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -430,6 +430,9 @@ sub collect_one_suite($)
       {
 	foreach my $test (@cases)
 	{
+
+	  next if ( $test->{'skip'} );
+
 	  # Skip this combination if the values it provides
 	  # already are set in master_opt or slave_opt
 	  if (My::Options::is_set($test->{master_opt}, $comb->{comb_opt}) &&

From e898b7943bd07b9ff51539ddfd31496904307bf2 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Tue, 8 Jan 2008 21:45:15 +0100
Subject: [PATCH 13/26] reset master first in test to get consistent start

---
 mysql-test/r/mysqlbinlog.result | 1 +
 mysql-test/t/mysqlbinlog.test   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 7f500c88c26..1730b6b97eb 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -1,3 +1,4 @@
+reset master;
 set timestamp=1000000000;
 drop table if exists t1,t2,t3,t4,t5,t03,t04;
 create table t1 (word varchar(20));
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index 569c5a10c6a..4592e422560 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -4,6 +4,9 @@
 
 -- source include/have_log_bin.inc
 
+# Deletes all the binary logs
+reset master;
+
 # we need this for getting fixed timestamps inside of this test
 set timestamp=1000000000;
 

From 3f910d48f283b32293921923cb47dc5ba4d3fce2 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 10:20:15 +0100
Subject: [PATCH 14/26] Fix warnings

---
 client/mysqltest.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index ad9e7452430..1d02f4dbec2 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -7406,7 +7406,9 @@ void do_get_replace(struct st_command *command)
     if (!*from)
       die("Wrong number of arguments to replace_result in '%s'",
           command->query);
-    IF_WIN(fix_win_paths(to, from - to), 0);
+#ifdef __WIN__
+    fix_win_paths(to, from - to);
+#endif
     insert_pointer_name(&from_array,to);
     to= get_string(&buff, &from, command);
     insert_pointer_name(&to_array,to);
@@ -8597,7 +8599,9 @@ void free_pointer_array(POINTER_ARRAY *pa)
 void replace_dynstr_append_mem(DYNAMIC_STRING *ds,
                                const char *val, int len)
 {
-  IF_WIN(fix_win_paths(val, len), 0);
+#ifdef __WIN__
+  fix_win_paths(val, len);
+#endif
 
   if (glob_replace_regex)
   {

From af4bede6dfa2ee8b75cb7c60c0c9f2baee01c181 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 11:15:59 +0100
Subject: [PATCH 15/26] Fix reorder

---
 mysql-test/lib/mtr_cases.pm  | 6 ++++--
 mysql-test/mysql-test-run.pl | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 5e07c01bf7f..5dc76db99e4 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -37,6 +37,7 @@ our $default_storage_engine;
 our $opt_with_ndbcluster_only;
 our $defaults_file;
 our $defaults_extra_file;
+our $reorder;
 
 sub collect_option {
   my ($opt, $value)= @_;
@@ -120,7 +121,7 @@ sub collect_test_cases ($$) {
     }
   }
 
-  if ( $::opt_reorder )
+  if ( $reorder )
   {
     # Reorder the test cases in an order that will make them faster to run
     my %sort_criteria;
@@ -173,7 +174,8 @@ sub collect_test_cases ($$) {
 	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'}}) . "~");
+	my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : [];
+	push(@criteria, join("!", sort @{$opts}) . "~");
 
 	$sort_criteria{$test_name} = join(" ", @criteria);
       }
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e3b89707e57..5fd0ff5e277 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -124,7 +124,6 @@ sub using_extern { return (keys %opts_extern > 0);};
 
 our $opt_fast= 0;
 our $opt_force;
-our $opt_reorder= 0;
 our $opt_mem= $ENV{'MTR_MEM'};
 
 our $opt_gcov;
@@ -368,7 +367,7 @@ sub command_line_setup {
              'report-features'          => \$opt_report_features,
              'comment=s'                => \$opt_comment,
              'fast'                     => \$opt_fast,
-             'reorder'                  => \$opt_reorder,
+             'reorder'                  => \&collect_option,
              'enable-disabled'          => \&collect_option,
              'verbose+'                 => \$opt_verbose,
              'sleep=i'                  => \$opt_sleep,

From 1fa7072bfae9ddb70b8fff9c651b491672784b81 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 12:59:20 +0100
Subject: [PATCH 16/26] Bug#33763 Mysqld leaves readonly mode for cluster
 tables too early - part2  - Open tables readonly while not properly
 initialized  - Close cached tables when coming out of readonly mode  - Apply
 basically same patch as for 32275

---
 mysql-test/include/ndb_not_readonly.inc |  4 ++--
 sql/ha_ndbcluster.cc                    | 10 ++++++++--
 sql/ha_ndbcluster_binlog.cc             | 13 +++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/mysql-test/include/ndb_not_readonly.inc b/mysql-test/include/ndb_not_readonly.inc
index a87ba66f1ef..16e77a31639 100644
--- a/mysql-test/include/ndb_not_readonly.inc
+++ b/mysql-test/include/ndb_not_readonly.inc
@@ -11,13 +11,13 @@ let $counter= 600;
 while ($mysql_errno)
 {
   # Table is readonly until the mysqld has connected properly
-  --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
+  --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY
   replace into mysql.ndb_apply_status values(0,0,"",0,0);
   if ($mysql_errno)
   {
     if (!$counter)
     {
-      die("Failed while waiting for mysqld to come out of readonly mode");
+      die Failed while waiting for mysqld to come out of readonly mode;
     }
     dec $counter;
     --sleep 0.1
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index bf2b19bfc9c..1b0b5c53250 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -5138,6 +5138,7 @@ int ha_ndbcluster::create(const char *name,
           strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0))
     {
       DBUG_PRINT("info", ("Schema distribution table not setup"));
+      DBUG_ASSERT(ndb_schema_share);
       DBUG_RETURN(HA_ERR_NO_CONNECTION);
     }
     single_user_mode = NdbDictionary::Table::SingleUserModeReadWrite;
@@ -5963,6 +5964,7 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb,
   if (!ndb_schema_share)
   {
     DBUG_PRINT("info", ("Schema distribution table not setup"));
+    DBUG_ASSERT(ndb_schema_share);
     DBUG_RETURN(HA_ERR_NO_CONNECTION);
   }
   /* ndb_share reference temporary */
@@ -6144,6 +6146,7 @@ int ha_ndbcluster::delete_table(const char *name)
   if (!ndb_schema_share)
   {
     DBUG_PRINT("info", ("Schema distribution table not setup"));
+    DBUG_ASSERT(ndb_schema_share);
     DBUG_RETURN(HA_ERR_NO_CONNECTION);
   }
 #endif
@@ -6424,8 +6427,11 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
     DBUG_RETURN(res);
   }
 #ifdef HAVE_NDB_BINLOG
-  if (!ndb_binlog_tables_inited && ndb_binlog_running)
+  if (!ndb_binlog_tables_inited)
+  {
     table->db_stat|= HA_READ_ONLY;
+    sql_print_information("table '%s' opened read only", name);
+  }
 #endif
   DBUG_RETURN(0);
 }
@@ -6784,8 +6790,8 @@ static void ndbcluster_drop_database(handlerton *hton, char *path)
   if (!ndb_schema_share)
   {
     DBUG_PRINT("info", ("Schema distribution table not setup"));
+    DBUG_ASSERT(ndb_schema_share);
     DBUG_VOID_RETURN;
-    //DBUG_RETURN(HA_ERR_NO_CONNECTION);
   }
 #endif
   ndbcluster_drop_database_impl(path);
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 55af0c38aed..a6246e76538 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -879,12 +879,9 @@ int ndbcluster_setup_binlog_table_shares(THD *thd)
   {
     pthread_mutex_lock(&LOCK_open);
     ndb_binlog_tables_inited= TRUE;
-    if (ndb_binlog_running)
-    {
-      if (ndb_extra_logging)
-        sql_print_information("NDB Binlog: ndb tables writable");
-      close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0, TRUE);
-    }
+    if (ndb_extra_logging)
+      sql_print_information("NDB Binlog: ndb tables writable");
+    close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0, TRUE);
     pthread_mutex_unlock(&LOCK_open);
     /* Signal injector thread that all is setup */
     pthread_cond_signal(&injector_cond);
@@ -2029,6 +2026,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
                                ndb_schema_share->use_count));
       free_share(&ndb_schema_share);
       ndb_schema_share= 0;
+      ndb_binlog_tables_inited= 0;
       pthread_mutex_unlock(&ndb_schema_share_mutex);
       /* end protect ndb_schema_share */
 
@@ -3226,6 +3224,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb,
                                share->key, share->use_count));
       free_share(&ndb_apply_status_share);
       ndb_apply_status_share= 0;
+      ndb_binlog_tables_inited= 0;
     }
     DBUG_PRINT("error", ("CLUSTER FAILURE EVENT: "
                         "%s  received share: 0x%lx  op: 0x%lx  share op: 0x%lx  "
@@ -3245,6 +3244,7 @@ ndb_binlog_thread_handle_non_data_event(THD *thd, Ndb *ndb,
                                share->key, share->use_count));
       free_share(&ndb_apply_status_share);
       ndb_apply_status_share= 0;
+      ndb_binlog_tables_inited= 0;
     }
     /* ToDo: remove printout */
     if (ndb_extra_logging)
@@ -4220,6 +4220,7 @@ err:
                              ndb_schema_share->use_count));
     free_share(&ndb_schema_share);
     ndb_schema_share= 0;
+    ndb_binlog_tables_inited= 0;
     pthread_mutex_unlock(&ndb_schema_share_mutex);
     /* end protect ndb_schema_share */
   }

From 8f8b396e8cb4515753d8383a69032975200f2fdd Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 13:47:09 +0100
Subject: [PATCH 17/26] Add printouts when servers are restarted Disable
 dynamic option switch

---
 mysql-test/mysql-test-run.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 5fd0ff5e277..fac5810ec9c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2822,6 +2822,9 @@ sub server_need_restart {
 
     if (!My::Options::same($started_opts, $extra_opts) )
     {
+      my $use_dynamic_option_switch= 0;
+      return 1 if (!$use_dynamic_option_switch);
+
       mtr_verbose(My::Options::toStr("started_opts", @$started_opts));
       mtr_verbose(My::Options::toStr("extra_opts", @$extra_opts));
 
@@ -2907,7 +2910,7 @@ sub stop_servers($$) {
     # All servers are going down, use some kind of order to
     # avoid too many warnings in the log files
 
-   mtr_verbose("All servers are going down");
+   mtr_report("Restarting all servers");
 
     #  mysqld processes
     My::SafeProcess::shutdown( $opt_shutdown_timeout, started(mysqlds()) );
@@ -2918,6 +2921,8 @@ sub stop_servers($$) {
   }
   else
   {
+    mtr_report("Restarting ", started(@servers));
+
      # Stop only some servers
     My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started(@servers) );

From 36c69b9d6cab96da29638bb7091cfe9301cf2394 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 16:10:25 +0100
Subject: [PATCH 18/26] Fix bug where local variable masked outer variable

---
 mysql-test/lib/My/SafeProcess.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index 612096cceb7..c3e368eea8d 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -95,7 +95,7 @@ if (IS_WIN32PERL or IS_CYGWIN){
   push(@safe_process_cmd, $exe);
 
   # Use my_safe_kill.exe
-  my $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill");
+  $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill");
   die "Could not find my_safe_kill.exe" unless $safe_kill;
 }
 else {

From 76951b55343aed00d5b9ed31d36d75dbc7ea005f Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Wed, 9 Jan 2008 19:13:07 +0100
Subject: [PATCH 19/26] Bug#33748 my_getsystime, my_micro_time and
 my_micro_time_and_time broken on windows  - Fix 'my_win_init' code that
 handles initialization of    "query_performance_counter" and conversion from
 registry values to    environment strings

---
 mysys/my_init.c | 115 ++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 67 deletions(-)

diff --git a/mysys/my_init.c b/mysys/my_init.c
index 6d1b9ec04be..5afc1e377ac 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -30,7 +30,6 @@
 #endif
 my_bool have_tcpip=0;
 static void my_win_init(void);
-static my_bool win32_have_tcpip(void);
 static my_bool win32_init_tcp_ip();
 #else
 #define my_win_init()
@@ -233,29 +232,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
 
 #ifdef __WIN__
 
-/*
-  This code is specially for running MySQL, but it should work in
-  other cases too.
-
-  Inizializzazione delle variabili d'ambiente per Win a 32 bit.
-
-  Vengono inserite nelle variabili d'ambiente (utilizzando cosi'
-  le funzioni getenv e putenv) i valori presenti nelle chiavi
-  del file di registro:
-
-  HKEY_LOCAL_MACHINE\software\MySQL
-
-  Se la kiave non esiste nonn inserisce nessun valore
-*/
-
-/* Crea la stringa d'ambiente */
-
-void setEnvString(char *ret, const char *name, const char *value)
-{
-  DBUG_ENTER("setEnvString");
-  strxmov(ret, name,"=",value,NullS);
-  DBUG_VOID_RETURN ;
-}
 
 /*
   my_parameter_handler
@@ -305,17 +281,6 @@ int handle_rtc_failure(int err_type, const char *file, int line,
 
 static void my_win_init(void)
 {
-  HKEY	hSoftMysql ;
-  DWORD dimName = 256 ;
-  DWORD dimData = 1024 ;
-  DWORD dimNameValueBuffer = 256 ;
-  DWORD dimDataValueBuffer = 1024 ;
-  DWORD indexValue = 0 ;
-  long	retCodeEnumValue ;
-  char	NameValueBuffer[256] ;
-  char	DataValueBuffer[1024] ;
-  char	EnvString[1271] ;
-  const char *targetKey = "Software\\MySQL" ;
   DBUG_ENTER("my_win_init");
 
   setlocale(LC_CTYPE, "");             /* To get right sortorder */
@@ -343,43 +308,58 @@ static void my_win_init(void)
 
   _tzset();
 
-  /* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,(LPCTSTR)targetKey,0,
-		   KEY_READ,&hSoftMysql) != ERROR_SUCCESS)
-    DBUG_VOID_RETURN;
-
-  /*
-  ** Ne legge i valori e li inserisce  nell'ambiente
-  ** suppone che tutti i valori letti siano di tipo stringa + '\0'
-  ** Legge il valore con indice 0 e lo scarta
-  */
-  retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++,
-				  (LPTSTR)NameValueBuffer, &dimNameValueBuffer,
-				  NULL, NULL, (LPBYTE)DataValueBuffer,
-				  &dimDataValueBuffer) ;
-
-  while (retCodeEnumValue != ERROR_NO_MORE_ITEMS)
   {
-    char *my_env;
-    /* Crea la stringa d'ambiente */
-    setEnvString(EnvString, NameValueBuffer, DataValueBuffer) ;
+    /*
+      Open HKEY_LOCAL_MACHINE\SOFTWARE\MySQL and set any strings found
+      there as environment variables
+    */
+    HKEY key_handle;
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)"SOFTWARE\\MySQL",
+                     0, KEY_READ, &key_handle) == ERROR_SUCCESS)
+    {
+      LONG ret;
+      DWORD index= 0;
+      DWORD type;
+      char key_name[256], key_data[1024];
+      size_t key_name_len= sizeof(key_name) - 1;
+      size_t key_data_len= sizeof(key_data) - 1;
 
-    /* Inserisce i dati come variabili d'ambiente */
-    my_env=strdup(EnvString);  /* variable for putenv must be allocated ! */
-    putenv(my_env) ;
+      while ((ret= RegEnumValue(key_handle, index++,
+                                key_name, &key_name_len,
+                                NULL, &type, (LPBYTE)&key_data,
+                                &key_data_len)) != ERROR_NO_MORE_ITEMS)
+      {
+        char env_string[sizeof(key_name) + sizeof(key_data) + 2];
 
-    dimNameValueBuffer = dimName ;
-    dimDataValueBuffer = dimData ;
+        if (ret == ERROR_MORE_DATA)
+        {
+          /* Registry value larger than 'key_data', skip it */
+          DBUG_PRINT("error", ("Skipped registry value that was too large"));
+        }
+        else if (ret == ERROR_SUCCESS)
+        {
+          if (type == REG_SZ)
+          {
+            strxmov(env_string, key_name, "=", key_data, NullS);
 
-    retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++,
-				    NameValueBuffer, &dimNameValueBuffer,
-				    NULL, NULL, (LPBYTE)DataValueBuffer,
-				    &dimDataValueBuffer) ;
+            /* variable for putenv must be allocated ! */
+            putenv(strdup(env_string)) ;
+          }
+        }
+        else
+        {
+          /* Unhandled error, break out of loop */
+          break;
+        }
+
+        key_name_len= sizeof(key_name) - 1;
+        key_data_len= sizeof(key_data) - 1;
+      }
+
+      RegCloseKey(key_handle) ;
+    }
   }
 
-  /* chiude la chiave */
-  RegCloseKey(hSoftMysql) ;
-
   /* The following is used by time functions */
 #define OFFSET_TO_EPOC ((__int64) 134774 * 24 * 60 * 60 * 1000 * 1000 * 10)
 #define MS 10000000
@@ -387,7 +367,8 @@ static void my_win_init(void)
     FILETIME ft;
     LARGE_INTEGER li, t_cnt;
     DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency));
-    if (QueryPerformanceFrequency((LARGE_INTEGER *)&query_performance_frequency))
+    if (QueryPerformanceFrequency((LARGE_INTEGER *)
+                                  &query_performance_frequency) == 0)
       query_performance_frequency= 0;
     else
     {

From da6073b4bcf4e76624a6cd38d0c12083245cc1d2 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 10 Jan 2008 10:25:45 +0100
Subject: [PATCH 20/26] Revert removal of ER_GET_ERRMSG

---
 mysql-test/include/ndb_not_readonly.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/include/ndb_not_readonly.inc b/mysql-test/include/ndb_not_readonly.inc
index 16e77a31639..f50ca0cab66 100644
--- a/mysql-test/include/ndb_not_readonly.inc
+++ b/mysql-test/include/ndb_not_readonly.inc
@@ -11,7 +11,7 @@ let $counter= 600;
 while ($mysql_errno)
 {
   # Table is readonly until the mysqld has connected properly
-  --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY
+  --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
   replace into mysql.ndb_apply_status values(0,0,"",0,0);
   if ($mysql_errno)
   {

From 727afed6576346c336cd5addfeb2ce65b6401cda Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 10 Jan 2008 10:44:18 +0100
Subject: [PATCH 21/26] Add --repeat and --retry

---
 mysql-test/lib/mtr_report.pl |  7 ++++-
 mysql-test/mysql-test-run.pl | 58 ++++++++++++++++++++++++++++++++----
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 61a698f4123..6365593786c 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -92,7 +92,10 @@ sub mtr_report_test_passed ($$) {
     $tot_real_time += ($timer/1000);
     $timer= sprintf "%12s", $timer;
   }
-  $tinfo->{'result'}= 'MTR_RES_PASSED';
+  # Set as passed unless already set
+  if ( not defined $tinfo->{'result'} ){
+    $tinfo->{'result'}= 'MTR_RES_PASSED';
+  }
   mtr_report("[ pass ]   $timer");
 }
 
@@ -102,6 +105,8 @@ sub mtr_report_test_failed ($$) {
   mtr_report_test_name($tinfo);
 
   $tinfo->{'result'}= 'MTR_RES_FAILED';
+  my $test_failures= $tinfo->{'failures'} || 0;
+  $tinfo->{'failures'}=  $test_failures + 1;
   if ( defined $tinfo->{'timeout'} )
   {
     mtr_report("[ fail ]  timeout");
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fac5810ec9c..d88ad3dea3b 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -161,6 +161,9 @@ my $opt_start_timeout   =    30; # 30 seconds
 
 my $opt_start;
 my $opt_start_dirty;
+my $opt_repeat= 1;
+my $opt_retry= 1;
+my $opt_retry_failure= 2;
 
 my $opt_strace_client;
 
@@ -374,8 +377,9 @@ sub command_line_setup {
              'start-dirty'              => \$opt_start_dirty,
              'start'                    => \$opt_start,
 	     'print-testcases'          => \&collect_option,
-# TODO 'repeat'
-# TODO 'retry'
+	     'repeat=i'                 => \$opt_repeat,
+	     'retry=i'                  => \$opt_retry,
+	     'retry-failure=i'          => \$opt_retry_failure,
              'timer!'                   => \$opt_timer,
              'user=s'                   => \$opt_user,
              'testcase-timeout=i'       => \$opt_testcase_timeout,
@@ -1742,7 +1746,39 @@ sub run_tests {
       next;
     }
 
-    run_testcase($tinfo);
+    for my $repeat (1..$opt_repeat){
+
+      if (run_testcase($tinfo))
+      {
+	# Testcase failed, enter retry mode
+	my $retries= 1;
+	while ($retries <= $opt_retry){
+	  mtr_report("\nRetrying, attempt($retries/$opt_retry)...\n");
+
+	  if (run_testcase($tinfo) <= 0)
+	  {
+	    # Testcase suceeded
+
+	    my $test_has_failed= $tinfo->{failures} || 0;
+	    if (!$test_has_failed){
+	      last;
+	    }
+	  }
+	  else
+	  {
+	    # Testcase failed
+
+	    # Limit number of test failures
+	    my $failures= $tinfo->{failures};
+	    if ($opt_retry > 1 and $failures >= $opt_retry_failure){
+	      mtr_report("Test has failed $failures times, no more retries!\n");
+	      last;
+	    }
+	  }
+	  $retries++;
+	}
+      }
+    }
   }
   # Kill the test suite timer
   $suite_timeout_proc->kill();
@@ -2184,6 +2220,11 @@ my %old_env;
 #
 # Run a single test case
 #
+# RETURN VALUE
+#  0 OK
+#  > 0 failure
+#
+
 sub run_testcase ($) {
   my $tinfo=  shift;
 
@@ -2362,7 +2403,7 @@ sub run_testcase ($) {
       # Remove the file that mysql-test-run writes info to
       unlink($path_current_test_log);
 
-      return;
+      return ($res == 62) ? 0 : $res;
 
     }
 
@@ -2389,7 +2430,7 @@ sub run_testcase ($) {
 	"Server failed during test run";
 
       report_failure_and_restart($tinfo);
-      return;
+      return 1;
     }
 
     # ----------------------------------------------------
@@ -2400,7 +2441,7 @@ sub run_testcase ($) {
       mtr_report("Test case timeout!");
       $tinfo->{'timeout'}= 1;           # Mark as timeout
       report_failure_and_restart($tinfo);
-      return;
+      return 1;
     }
 
     # ----------------------------------------------------
@@ -2414,6 +2455,7 @@ sub run_testcase ($) {
 
     mtr_error("Unhandled process $proc exited");
   }
+  mtr_error("Should never come here");
 }
 
 
@@ -3631,6 +3673,10 @@ Misc options
                         the first specified test case
   fast                  Run as fast as possible, dont't wait for servers
                         to shutdown etc.
+  repeat=N              Run each test N number of times
+  retry=N               Retry tests that fail N times, limit number of failures
+                        to $max_failures
+  retry-failure=N       Limit number of retries for a failed test
   reorder               Reorder tests to get fewer server restarts
   help                  Get this help text
 

From b23110f2de94e8abb51a9140bfdcfa4a3e6c1400 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 10 Jan 2008 12:00:56 +0100
Subject: [PATCH 22/26] Auto kill any children before exiting from process

---
 mysql-test/lib/My/SafeProcess.pm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index 612096cceb7..53577c96602 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -85,6 +85,24 @@ BEGIN {
   }
 }
 
+END {
+  # Kill any children still running
+  for my $proc (values %running){
+    if ( $proc->is_child($$) ){
+      print "Killing: $proc\n";
+      $proc->kill();
+    }
+  }
+}
+
+
+sub is_child {
+  my ($self, $parent_pid)= @_;
+  die "usage: \$safe_proc->is_child()" unless (@_ == 2 and ref $self);
+  return ($self->{PARENT} == $parent_pid);
+}
+
+
 # Find the safe process binary or script
 my @safe_process_cmd;
 my $safe_kill;
@@ -172,6 +190,7 @@ sub new {
       SAFE_WINPID  => $winpid,
       SAFE_NAME => $name,
       SAFE_SHUTDOWN => $shutdown,
+      PARENT => $$,
      }, $class);
 
   # Put the new process in list of running
@@ -203,6 +222,7 @@ sub timer {
       ({
 	SAFE_PID  => $pid,
 	SAFE_NAME => "timer",
+	PARENT => $$,
        }, $class);
 
     # Put the new process in list of running

From a7c70e4954145719f1e660ffd65ee316d37a38cb Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 10 Jan 2008 16:38:59 +0100
Subject: [PATCH 23/26] Fix misspelled variable name

---
 mysql-test/mysql-test-run.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d88ad3dea3b..b72fd085609 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3675,7 +3675,7 @@ Misc options
                         to shutdown etc.
   repeat=N              Run each test N number of times
   retry=N               Retry tests that fail N times, limit number of failures
-                        to $max_failures
+                        to $opt_retry_failure
   retry-failure=N       Limit number of retries for a failed test
   reorder               Reorder tests to get fewer server restarts
   help                  Get this help text

From af96a3f8ba04977038d3864a48ad836d7d673d5f Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 10 Jan 2008 16:50:37 +0100
Subject: [PATCH 24/26] - Add autodetection of which my.cnfs to use for each
 testcase if suite does not have a my.cnf of it's own - Fix paths: master-data
 => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data

---
 mysql-test/lib/mtr_cases.pm                   |   13 +-
 mysql-test/suite/parts/inc/partition.pre      |    4 +-
 .../suite/parts/inc/partition_basic.inc       |   16 +-
 .../suite/parts/inc/partition_check_drop.inc  |   14 +-
 .../suite/parts/inc/partition_layout.inc      |    2 +-
 .../parts/inc/partition_layout_check1.inc     |   12 +-
 .../parts/inc/partition_layout_check2.inc     |    8 +-
 .../inc/partition_supported_sql_funcs.inc     |    9 +-
 .../r/part_supported_sql_func_innodb.result   |  126 +-
 .../r/part_supported_sql_func_myisam.result   |  126 +-
 .../parts/r/partition_alter1_myisam.result    | 1984 ++++----
 .../parts/r/partition_alter2_myisam.result    | 4464 ++++++++---------
 .../parts/r/partition_alter3_innodb.result    |  104 +-
 .../parts/r/partition_alter3_myisam.result    |  480 +-
 .../parts/r/partition_alter4_myisam.result    | 2528 +++++-----
 .../parts/r/partition_basic_innodb.result     |   62 +-
 .../parts/r/partition_basic_myisam.result     | 1894 +++----
 .../parts/r/partition_engine_myisam.result    |  220 +-
 .../parts/r/partition_syntax_myisam.result    |  160 +-
 mysql-test/suite/parts/r/partition_t55.out    |  124 +-
 .../suite/parts/t/partition_sessions.test     |    8 +-
 21 files changed, 6186 insertions(+), 6172 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 5e07c01bf7f..3aae4cceff7 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -892,8 +892,19 @@ sub collect_one_test_case {
     my $config= "$suitedir/my.cnf";
     if (! -f $config )
     {
-      # Suite has no config, use default.cnf
+      # assume default.cnf will be used
       $config= "include/default_my.cnf";
+
+      # Suite has no config, autodetect which one to use
+      if ( $tinfo->{rpl_test} ){
+	$config= "suite/rpl/my.cnf";
+	if ( $tinfo->{ndb_test} ){
+	  $config= "suite/rpl_ndb/my.cnf";
+	}
+      }
+      elsif ( $tinfo->{ndb_test} ){
+	$config= "suite/ndb/my.cnf";
+      }
     }
     $tinfo->{template_path}= $config;
   }
diff --git a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre
index 0c906ce4581..7c3b0d9d1ef 100644
--- a/mysql-test/suite/parts/inc/partition.pre
+++ b/mysql-test/suite/parts/inc/partition.pre
@@ -246,7 +246,7 @@ if (0)
 # Option, for displaying files:
 #     $ls= 1 (default)
 #          --> Display the table related directory content via
-#                "ls $MYSQLTEST_VARDIR/master-data/test/t1*"
+#                "ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*"
 #              if these informations were collected.
 #              This is probably not portable to some OS.
 #     $ls= 0
@@ -410,7 +410,7 @@ if (0)
 # 3. How to analyze a partitioning bug revealed with these tests/ How to build
 #    a small replay script from the monstrous protocols ?
 #------------------------------------------------------------------------------#
-# a) crash    -- use the file var/master-data/mysql/general_log.CSV
+# a) crash    -- use the file var/mysqld.1/data/mysql/general_log.CSV
 # b) no crash, but unexpected server response (there is no "reject file)
 #             -- use the file r/<testcase>.log
 #                Please be aware that the option $debug= 0 suppresses the
diff --git a/mysql-test/suite/parts/inc/partition_basic.inc b/mysql-test/suite/parts/inc/partition_basic.inc
index a5815d3b71c..72673a0d535 100644
--- a/mysql-test/suite/parts/inc/partition_basic.inc
+++ b/mysql-test/suite/parts/inc/partition_basic.inc
@@ -35,16 +35,16 @@ let $unique= ;
    --disable_query_log
    # DATA DIRECTORY
    # Make directory for partition data
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true
    eval SET @data_dir = 'DATA DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data''''';
    let $data_directory = `select @data_dir`;
 
    #INDEX DIRECTORY
    # Make directory for partition index
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true
    eval SET @indx_dir = 'INDEX DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index''''';
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= 1;
@@ -78,16 +78,16 @@ if ($more_pk_ui_tests)
    --disable_query_log
    # DATA DIRECTORY
    # Make directory for partition data
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true
    eval SET @data_dir = 'DATA DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data''''';
    let $data_directory = `select @data_dir`;
 
    #INDEX DIRECTORY
    # Make directory for partition index
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true
    eval SET @indx_dir = 'INDEX DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index''''';
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= TRUE;
diff --git a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
index 88ebdb7ad48..1e06fbdd156 100644
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc
@@ -24,13 +24,13 @@ if ($no_debug)
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -62,11 +62,11 @@ if ($found_garbage)
    }
    # Do a manual cleanup, because the following tests should not suffer from
    # remaining files
-   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/t1* || true
+   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* || true
    if ($with_directories)
    {
-	   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/data/t1* || true
-	   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/index/t1* || true
+	   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* || true
+	   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* || true
    }
 }
 --enable_query_log
diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc
index c4181ef1cfd..b9835cb4d55 100644
--- a/mysql-test/suite/parts/inc/partition_layout.inc
+++ b/mysql-test/suite/parts/inc/partition_layout.inc
@@ -10,5 +10,5 @@ eval SHOW CREATE TABLE t1;
 if ($ls)
 {
    --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+   --exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*
 }
diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
index 9989f4ed9e3..3d8f634603b 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc
@@ -31,17 +31,17 @@ DELETE FROM t0_definition;
 # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than
 #   the corresponding SELECT on the INFORMATION_SCHEMA
 # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2''
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2''
 )');
 let $file_list= `SELECT @aux`;
 }
@@ -52,7 +52,7 @@ let $file_list= '--- not determined ---';
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'old',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
+     create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'),
      file_list      = $file_list;
 
 # Print the create table statement into the protocol
diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
index 05c44a73a7f..1cd4fe5aa8d 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc
@@ -27,12 +27,12 @@ if ($no_debug)
 DELETE FROM t0_definition WHERE state = 'new';
 
 # Dump the current definition of the table t1 to tmp1
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -42,7 +42,7 @@ let $file_list= '--- not determined ---';
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'new',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
+     create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'),
      file_list      = $file_list;
 
 # Print the old and new table layout, if they differ
diff --git a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
index d9c1f5836f0..029b8676533 100644
--- a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
+++ b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
@@ -83,9 +83,12 @@ eval insert into t3 values ($val1);
 eval insert into t3 values ($val2);
 eval insert into t3 values ($val3);
 
-eval load data infile '../std_data_ln/parts/$infile' into table t4;
-eval load data infile '../std_data_ln/parts/$infile' into table t5;
-eval load data infile '../std_data_ln/parts/$infile' into table t6;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t4;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t5;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t6;
 
 eval select $sqlfunc from t1 order by col1;
 
diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
index c47c22ed363..f73f175f635 100644
--- a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values (17);
 insert into t3 values (5);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select mod(col1,10) from t1 order by col1;
 mod(col1,10)
 5
@@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -6423,9 +6423,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select datediff(col1, '2006-01-01') from t1 order by col1;
 datediff(col1, '2006-01-01')
 16
@@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
index f14f9517646..1150081e89b 100644
--- a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values (17);
 insert into t3 values (5);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select mod(col1,10) from t1 order by col1;
 mod(col1,10)
 5
@@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -6423,9 +6423,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select datediff(col1, '2006-01-01') from t1 order by col1;
 datediff(col1, '2006-01-01')
 16
@@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/parts/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result
index 1058342aa8d..28e4523609e 100644
--- a/mysql-test/suite/parts/r/partition_alter1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result
@@ -236,12 +236,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -751,18 +751,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1280,24 +1280,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1813,20 +1813,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2338,24 +2338,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2873,24 +2873,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3406,24 +3406,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3937,26 +3937,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4467,12 +4467,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4982,18 +4982,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5511,24 +5511,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6044,20 +6044,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6569,24 +6569,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7104,24 +7104,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7637,24 +7637,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8168,26 +8168,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8703,12 +8703,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9218,18 +9218,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9747,24 +9747,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10280,20 +10280,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10805,24 +10805,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11338,24 +11338,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11871,24 +11871,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12402,26 +12402,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12932,12 +12932,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13447,18 +13447,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13976,24 +13976,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14509,20 +14509,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15034,24 +15034,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15567,24 +15567,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16100,24 +16100,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16631,26 +16631,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17167,12 +17167,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17630,18 +17630,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18107,24 +18107,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18588,20 +18588,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19061,24 +19061,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19544,24 +19544,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20025,24 +20025,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20504,26 +20504,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20986,12 +20986,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21449,18 +21449,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21926,24 +21926,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22407,20 +22407,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22880,24 +22880,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23361,24 +23361,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23842,24 +23842,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24321,26 +24321,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24799,12 +24799,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25262,18 +25262,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25739,24 +25739,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26220,20 +26220,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26693,24 +26693,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27174,24 +27174,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27655,24 +27655,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28134,26 +28134,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28612,12 +28612,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29075,18 +29075,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29552,24 +29552,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30033,20 +30033,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30506,24 +30506,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30987,24 +30987,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31468,24 +31468,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31947,26 +31947,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result
index 18abf7380c3..13996123d9f 100644
--- a/mysql-test/suite/parts/r/partition_alter2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result
@@ -76,12 +76,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -539,18 +539,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1016,24 +1016,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1497,20 +1497,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1970,24 +1970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2453,24 +2453,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2934,24 +2934,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3413,26 +3413,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3893,12 +3893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4408,18 +4408,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4937,24 +4937,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5470,20 +5470,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5995,24 +5995,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6530,24 +6530,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7063,24 +7063,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7594,26 +7594,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8124,12 +8124,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8639,18 +8639,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9168,24 +9168,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9701,20 +9701,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10226,24 +10226,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10761,24 +10761,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11294,24 +11294,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11825,26 +11825,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12359,12 +12359,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12822,18 +12822,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13299,24 +13299,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13780,20 +13780,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14253,24 +14253,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14736,24 +14736,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15217,24 +15217,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15696,26 +15696,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16174,12 +16174,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16637,18 +16637,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17114,24 +17114,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17595,20 +17595,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18068,24 +18068,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18549,24 +18549,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19030,24 +19030,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19509,26 +19509,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19989,12 +19989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20504,18 +20504,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21033,24 +21033,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21566,20 +21566,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22091,24 +22091,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22626,24 +22626,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23159,24 +23159,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23690,26 +23690,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24220,12 +24220,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24735,18 +24735,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25264,24 +25264,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25797,20 +25797,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26322,24 +26322,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26855,24 +26855,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27388,24 +27388,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27919,26 +27919,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28449,12 +28449,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28964,18 +28964,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29493,24 +29493,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30026,20 +30026,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30551,24 +30551,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31086,24 +31086,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31619,24 +31619,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32150,26 +32150,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32680,12 +32680,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33195,18 +33195,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33724,24 +33724,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34257,20 +34257,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34782,24 +34782,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35315,24 +35315,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35848,24 +35848,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36379,26 +36379,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36917,12 +36917,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37382,18 +37382,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37861,24 +37861,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38344,20 +38344,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38817,24 +38817,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39302,24 +39302,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39783,24 +39783,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40264,26 +40264,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40746,12 +40746,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41263,18 +41263,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41794,24 +41794,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42329,20 +42329,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42854,24 +42854,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43391,24 +43391,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43924,24 +43924,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44457,26 +44457,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44989,12 +44989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -45506,18 +45506,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46037,24 +46037,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46572,20 +46572,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47097,24 +47097,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47634,24 +47634,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48167,24 +48167,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48700,26 +48700,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49235,12 +49235,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49701,18 +49701,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50181,24 +50181,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50665,20 +50665,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51143,24 +51143,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51629,24 +51629,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52115,24 +52115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52597,26 +52597,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53078,12 +53078,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53544,18 +53544,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54024,24 +54024,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54508,20 +54508,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54986,24 +54986,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55472,24 +55472,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55958,24 +55958,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56440,26 +56440,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56923,12 +56923,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57441,18 +57441,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57973,24 +57973,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -58509,20 +58509,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59039,24 +59039,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59577,24 +59577,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60115,24 +60115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60649,26 +60649,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61182,12 +61182,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61700,18 +61700,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62232,24 +62232,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62768,20 +62768,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63298,24 +63298,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63836,24 +63836,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64374,24 +64374,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64908,26 +64908,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65441,12 +65441,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65959,18 +65959,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66491,24 +66491,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67027,20 +67027,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67557,24 +67557,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68095,24 +68095,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68633,24 +68633,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69167,26 +69167,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69700,12 +69700,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70218,18 +70218,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70750,24 +70750,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71286,20 +71286,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71816,24 +71816,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72354,24 +72354,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72892,24 +72892,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73426,26 +73426,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result
index 2ca1e783839..edeca8f55b3 100644
--- a/mysql-test/suite/parts/r/partition_alter3_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result
@@ -56,7 +56,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -77,8 +77,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -94,8 +94,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -109,8 +109,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -130,8 +130,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -149,8 +149,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -165,8 +165,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -193,8 +193,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -208,8 +208,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -223,8 +223,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -238,8 +238,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -253,8 +253,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -268,8 +268,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -283,8 +283,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -302,7 +302,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -341,7 +341,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -363,8 +363,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1)  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -387,8 +387,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -406,8 +406,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -425,8 +425,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -451,8 +451,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -469,8 +469,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -487,8 +487,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -505,8 +505,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -523,8 +523,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -541,8 +541,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -559,8 +559,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -581,7 +581,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result
index 5684ca89b1c..1c897324adc 100644
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result
@@ -56,9 +56,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -79,10 +79,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -98,10 +98,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -115,10 +115,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -138,14 +138,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -163,16 +163,16 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -187,24 +187,24 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -231,22 +231,22 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -260,20 +260,20 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -287,18 +287,18 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -312,16 +312,16 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -335,14 +335,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -356,12 +356,12 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -375,10 +375,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -396,9 +396,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -431,9 +431,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -455,10 +455,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1)  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -481,14 +481,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -506,16 +506,16 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -533,24 +533,24 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -575,22 +575,22 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -607,20 +607,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -637,18 +637,18 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -665,16 +665,16 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -691,14 +691,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -715,12 +715,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -737,10 +737,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -761,9 +761,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result
index 8eac8d414de..2e68b7710bd 100644
--- a/mysql-test/suite/parts/r/partition_alter4_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result
@@ -75,12 +75,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -538,18 +538,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1015,24 +1015,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1496,20 +1496,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1969,24 +1969,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2452,24 +2452,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2933,24 +2933,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3412,26 +3412,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3891,12 +3891,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4354,18 +4354,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4831,24 +4831,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5312,20 +5312,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5785,24 +5785,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6268,24 +6268,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6749,24 +6749,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7228,26 +7228,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8030,12 +8030,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8493,18 +8493,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8970,24 +8970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9451,20 +9451,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9924,24 +9924,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10407,24 +10407,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10888,24 +10888,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11367,26 +11367,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11846,12 +11846,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12309,18 +12309,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12786,24 +12786,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13267,20 +13267,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13740,24 +13740,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14223,24 +14223,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14704,24 +14704,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15183,26 +15183,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15985,12 +15985,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16448,18 +16448,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16925,24 +16925,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17406,20 +17406,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17879,24 +17879,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18362,24 +18362,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18843,24 +18843,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19322,26 +19322,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19801,12 +19801,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20264,18 +20264,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20741,24 +20741,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21222,20 +21222,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21695,24 +21695,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22178,24 +22178,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22659,24 +22659,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23138,26 +23138,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23940,12 +23940,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24403,18 +24403,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24880,24 +24880,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25361,20 +25361,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25834,24 +25834,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26317,24 +26317,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26798,24 +26798,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27277,26 +27277,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27756,12 +27756,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28219,18 +28219,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28696,24 +28696,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29177,20 +29177,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29650,24 +29650,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30133,24 +30133,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30614,24 +30614,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31093,26 +31093,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31895,12 +31895,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32358,18 +32358,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32835,24 +32835,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33316,20 +33316,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33789,24 +33789,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34272,24 +34272,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34753,24 +34753,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35232,26 +35232,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35711,12 +35711,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36174,18 +36174,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36651,24 +36651,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37132,20 +37132,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37605,24 +37605,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38088,24 +38088,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38569,24 +38569,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39048,26 +39048,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39850,9 +39850,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40310,9 +40310,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40778,9 +40778,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41244,9 +41244,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41708,9 +41708,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42176,9 +42176,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42644,9 +42644,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43108,9 +43108,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result
index b9097e33ce0..d3e8cefeb45 100644
--- a/mysql-test/suite/parts/r/partition_basic_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result
@@ -3620,7 +3620,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4065,7 +4065,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4510,7 +4510,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4955,7 +4955,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5398,7 +5398,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5843,7 +5843,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6286,7 +6286,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6731,7 +6731,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8067,7 +8067,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8512,7 +8512,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8955,7 +8955,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9400,7 +9400,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9843,7 +9843,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14878,7 +14878,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15360,7 +15360,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15840,7 +15840,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16322,7 +16322,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16802,7 +16802,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17284,7 +17284,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18731,7 +18731,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19213,7 +19213,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19693,7 +19693,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20175,7 +20175,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20655,7 +20655,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21137,7 +21137,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22616,7 +22616,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23114,7 +23114,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23610,7 +23610,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24108,7 +24108,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24604,7 +24604,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25102,7 +25102,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result
index 7e0d5bcd62a..fe490aa1b22 100644
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
@@ -66,12 +66,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -515,18 +515,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -970,24 +970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1431,20 +1431,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1886,24 +1886,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2347,24 +2347,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2806,24 +2806,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3267,26 +3267,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3728,19 +3728,19 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4159,31 +4159,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -4199,31 +4199,31 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4642,31 +4642,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -4682,43 +4682,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5137,31 +5137,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -5177,35 +5177,35 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5622,31 +5622,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -5662,43 +5662,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6117,31 +6117,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -6157,43 +6157,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6610,31 +6610,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -6650,43 +6650,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7105,31 +7105,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -7145,47 +7145,47 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7604,31 +7604,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -7648,12 +7648,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8097,18 +8097,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8549,27 +8549,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9010,23 +9010,23 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9465,27 +9465,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9926,27 +9926,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10385,27 +10385,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10860,12 +10860,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11318,18 +11318,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11790,24 +11790,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12266,20 +12266,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12734,24 +12734,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13210,24 +13210,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13686,24 +13686,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14160,26 +14160,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14631,12 +14631,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15133,18 +15133,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15638,27 +15638,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16152,23 +16152,23 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16660,27 +16660,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17174,27 +17174,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17686,27 +17686,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18200,29 +18200,29 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18734,12 +18734,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19245,18 +19245,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19770,24 +19770,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20299,20 +20299,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20820,24 +20820,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21349,24 +21349,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21878,24 +21878,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22405,26 +22405,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result
index f81becc6eea..9b6c3c9ed21 100644
--- a/mysql-test/suite/parts/r/partition_engine_myisam.result
+++ b/mysql-test/suite/parts/r/partition_engine_myisam.result
@@ -70,12 +70,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -534,12 +534,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -999,16 +999,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1465,12 +1465,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1925,12 +1925,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2390,16 +2390,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2857,16 +2857,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3328,16 +3328,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3795,16 +3795,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4262,12 +4262,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4727,16 +4727,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5196,16 +5196,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5659,10 +5659,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6118,12 +6118,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result
index 93cb075ce2f..ed610aafcfa 100644
--- a/mysql-test/suite/parts/r/partition_syntax_myisam.result
+++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result
@@ -662,12 +662,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 #  3.5.3 Reveal that IN (...NULL) is not mapped to IN(0)
@@ -694,14 +694,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part2 VALUES IN (0) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 
@@ -734,10 +734,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1)  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.1.2 no partition number, named partitions
@@ -761,12 +761,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.1.3 variations on no partition/subpartition number, named partitions,
@@ -852,20 +852,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (20) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 #------------------------------------------------------------------------
@@ -893,12 +893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -924,16 +924,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -956,10 +956,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 1  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -985,12 +985,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -1732,12 +1732,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -1766,16 +1766,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.3.2 (positive) number of partition/subpartition ,
diff --git a/mysql-test/suite/parts/r/partition_t55.out b/mysql-test/suite/parts/r/partition_t55.out
index d86ceda8c38..e309785a30c 100644
--- a/mysql-test/suite/parts/r/partition_t55.out
+++ b/mysql-test/suite/parts/r/partition_t55.out
@@ -4,65 +4,65 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY HASH (abs(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
-27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYI
-36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYI
-36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYI
-27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYI
-45	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYI
-8594	MYSQL_TEST_DIR/var/master-data/test/t55.frm
-408	MYSQL_TEST_DIR/var/master-data/test/t55.par
+27	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYI
+36	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYI
+36	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYI
+27	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYI
+45	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYI
+8594	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.frm
+408	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.par
diff --git a/mysql-test/suite/parts/t/partition_sessions.test b/mysql-test/suite/parts/t/partition_sessions.test
index ef3c5ef6a97..d9e3d6613aa 100644
--- a/mysql-test/suite/parts/t/partition_sessions.test
+++ b/mysql-test/suite/parts/t/partition_sessions.test
@@ -34,16 +34,16 @@ let $col_new_list    = new.f1,new.f2,new.f3 new.f4 ;
 --disable_query_log
 # DATA DIRECTORY
 # Make directory for partition data
---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpdata || true
+--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpdata || true
 eval SET @data_dir = 'DATA DIRECTORY =
-''$MYSQLTEST_VARDIR/master-data/tmpdata''';
+''$MYSQLTEST_VARDIR/mysqld.1/data/tmpdata''';
 let $data_directory = `select @data_dir`;
 
 #INDEX DIRECTORY
 # Make directory for partition index
---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpindex || true
+--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpindex || true
 eval SET @indx_dir = 'INDEX DIRECTORY =
-''$MYSQLTEST_VARDIR/master-data/tmpindex''';
+''$MYSQLTEST_VARDIR/mysqld.1/data/tmpindex''';
 let $index_directory = `select @indx_dir`;
 --enable_query_log
 

From 08cbaffbff9f01336bd33391c4653a74c08acfda Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Fri, 11 Jan 2008 10:44:16 +0100
Subject: [PATCH 25/26] Allow start-from to also filter on suitename

---
 mysql-test/lib/mtr_cases.pm  | 16 ++++++++++++----
 mysql-test/mysql-test-run.pl |  6 ++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 16d4da39667..2a8a3054ed9 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -653,18 +653,26 @@ sub collect_one_test_case {
   #print " filename: $filename\n";
 
   # ----------------------------------------------------------------------
-  # Skip some tests silently
+  # Check --start-from
   # ----------------------------------------------------------------------
-  if ( $start_from and $tname lt $start_from )
+  if ( $start_from )
   {
-    return;
+    # start_from can be specified as [suite.].testname_prefix
+    my ($suite, $test, $ext)= split_testname($start_from);
+
+    if ( $suite and $suitename lt $suite){
+      return; # Skip silently
+    }
+    if ( $tname lt $test ){
+      return; # Skip silently
+    }
   }
 
   # ----------------------------------------------------------------------
   # Set defaults
   # ----------------------------------------------------------------------
   my $tinfo= {};
-  $tinfo->{'name'}= basename($suitename) . ".$tname";
+  $tinfo->{'name'}= $suitename . ".$tname";
   $tinfo->{'path'}= "$testdir/$filename";
 
   # TODO allow nonexistsing result file
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b72fd085609..2d578e776f7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3588,8 +3588,10 @@ Options to control what test suites or cases to run
   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
+  start-from=PREFIX     Run test cases starting test prefixed with PREFIX where
+                        prefix may be suite.testname or just testname
+  suite[s]=NAME1,..,NAMEN
+                        Collect tests in suites from the comma separated
                         list of suite names.
                         The default is: "$opt_suites"
   skip-rpl              Skip the replication test cases.

From f8de652fe2a347acd264a96f8dd67506cb9c7361 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Fri, 11 Jan 2008 16:56:14 +0100
Subject: [PATCH 26/26] Update test result

---
 .../suite/binlog/r/binlog_multi_engine.result | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/mysql-test/suite/binlog/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result
index 67c3412ec15..83e0414bab0 100644
--- a/mysql-test/suite/binlog/r/binlog_multi_engine.result
+++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result
@@ -17,22 +17,22 @@ TRUNCATE t1b;
 TRUNCATE t1n;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
+mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
+mysqld-bin.000001	#	Query	#	#	use `test`; BEGIN
+mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c
+mysqld-bin.000001	#	Query	#	#	use `test`; COMMIT
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
+mysqld-bin.000001	#	Query	#	#	BEGIN
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
+mysqld-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+mysqld-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
 RESET MASTER;
 SET SESSION BINLOG_FORMAT=MIXED;
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
@@ -48,18 +48,18 @@ TRUNCATE t1b;
 TRUNCATE t1n;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: #
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
+mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
+mysqld-bin.000001	#	Query	#	#	BEGIN
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
+mysqld-bin.000001	#	Write_rows	#	#	table_id: #
+mysqld-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+mysqld-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
 RESET MASTER;
 SET SESSION BINLOG_FORMAT=ROW;
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
@@ -74,13 +74,13 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: #
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)
+mysqld-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+mysqld-bin.000001	#	Query	#	#	BEGIN
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
+mysqld-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
+mysqld-bin.000001	#	Write_rows	#	#	table_id: #
+mysqld-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+mysqld-bin.000001	#	Query	#	#	COMMIT
 RESET MASTER;
 DROP TABLE t1m, t1b, t1n;