Merge bk-internal:/home/bk/mysql-5.1-maint2

into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr
2025-07-29 05:21:33 +03:00 · 2008-01-18 00:06:30 +01:00
parent cf9053f199 f8de652fe2
commit df9d0ad133
37 changed files with 6870 additions and 6470 deletions
--- 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, "");
+    /* First try with unified diff */

-    /* Fallback to context diff with "diff -c" */
    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)
@ -7385,6 +7406,9 @@ void do_get_replace(struct st_command *command)
    if (!*from)
      die("Wrong number of arguments to replace_result in '%s'",
          command->query);
+#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);
--- a/mysql-test/include/ndb_not_readonly.inc
+++ b/mysql-test/include/ndb_not_readonly.inc
@ -17,7 +17,7 @@ while ($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
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@ -0,0 +1,196 @@
+# -*- 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";
+    #print "value: $value\n";
+    if ($name =~ /^O, (.*)/){
+      push(@sql, "SET GLOBAL $1=$value");
+    }
+    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");
+    }
+  }
+  return join("; ", @sql);
+}
+
+
+sub toStr {
+  my $name= shift;
+  return "$name: ",
+    "['", join("', '", @_), "']\n";
+}
+
+
+1;
+
--- 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;
@ -96,7 +114,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" unless $safe_kill;
 }
 else
@ -185,6 +203,7 @@ sub new {
      SAFE_WINPID  => $winpid,
      SAFE_NAME => $name,
      SAFE_SHUTDOWN => $shutdown,
+      PARENT => $$,
     }, $class);

  # Put the new process in list of running
@ -216,6 +235,7 @@ sub timer {
      ({
 	SAFE_PID  => $pid,
 	SAFE_NAME => "timer",
+	PARENT => $$,
       }, $class);

    # Put the new process in list of running
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@ -31,12 +31,13 @@ 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;
 our $defaults_file;
 our $defaults_extra_file;
+our $reorder;

 sub collect_option {
  my ($opt, $value)= @_;
@ -83,8 +84,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 +94,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);
@ -119,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;
@ -172,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);
      }
@ -236,6 +239,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 +308,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 +432,18 @@ sub collect_one_suite($)
      {
 	foreach my $test (@cases)
 	{
-	  #print $test->{name}, " ", $comb, "\n";
-	  my $new_test= {};

+	  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}) &&
+	      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 +463,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 +506,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 +514,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 +541,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;
      }
    }
  }
@ -630,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
@ -871,8 +902,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;
  }
@ -882,6 +924,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;
 }

--- 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;
--- 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'}");
    }
  }
@ -90,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");
 }

@ -100,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");
--- a/mysql-test/lib/t/Options.t
+++ 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";
+}
--- 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
@ -123,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;
@ -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;

@ -230,7 +233,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();

@ -367,15 +370,16 @@ 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,
             '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,
@ -543,7 +547,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");

@ -551,8 +555,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;
      }
    }
@ -776,7 +780,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
@ -788,7 +791,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));

 }
@ -1276,7 +1279,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));
@ -1286,14 +1289,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
@ -1756,7 +1751,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();
@ -2080,28 +2107,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;
@ -2197,6 +2225,11 @@ my %old_env;
 #
 # Run a single test case
 #
+# RETURN VALUE
+#  0 OK
+#  > 0 failure
+#
+
 sub run_testcase ($) {
  my $tinfo=  shift;

@ -2375,7 +2408,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;

    }

@ -2402,7 +2435,7 @@ sub run_testcase ($) {
 	"Server failed during test run";

      report_failure_and_restart($tinfo);
-      return;
+      return 1;
    }

    # ----------------------------------------------------
@ -2413,7 +2446,7 @@ sub run_testcase ($) {
      mtr_report("Test case timeout!");
      $tinfo->{'timeout'}= 1;           # Mark as timeout
      report_failure_and_restart($tinfo);
-      return;
+      return 1;
    }

    # ----------------------------------------------------
@ -2427,6 +2460,7 @@ sub run_testcase ($) {

    mtr_error("Unhandled process $proc exited");
  }
+  mtr_error("Should never come here");
 }


@ -2575,7 +2609,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 )
@ -2590,7 +2624,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);
  }

@ -2611,8 +2645,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 )
  {
@ -2627,7 +2660,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")
@ -2656,9 +2689,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;
@ -2674,7 +2710,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 )
  {
@ -2743,7 +2779,7 @@ sub mysqld_start ($$) {
  }

  # Remember options used when starting
-  $mysqld->{'started_opts'}= $extra_opt;
+  $mysqld->{'started_opts'}= $extra_opts;

  return;
 }
@ -2757,13 +2793,19 @@ 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());

 }


-
 # Find out if server should be restarted for this test
 sub server_need_restart {
  my ($tinfo, $server)= @_;
@ -2816,38 +2858,38 @@ 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);
-      }
-      else
-      {
+    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));
+
+      # 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: running with different options '" .
-		    join(" ", @{$extra_opt}) . "' != '" .
+		    join(" ", @{$extra_opts}) . "' != '" .
 		    join(" ", @{$server->{'started_opts'}}) . "'" );
 	return 1;
      }
+
+      # Remember the dynamically set options
+      $server->{'started_opts'}= $extra_opts;
    }
  }

@ -2895,7 +2937,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
@ -2915,7 +2957,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()) );
@ -2926,6 +2968,8 @@ sub stop_servers($$) {
  }
  else
  {
+    mtr_report("Restarting ", started(@servers));
+
     # Stop only some servers
    My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started(@servers) );
@ -3031,8 +3075,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;
@ -3549,8 +3593,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.
@ -3634,6 +3680,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 $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

--- 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));
--- 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;
--- 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
--- 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;
--- 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
--- 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*
 }
--- 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
--- 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
--- 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;

--- 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
--- 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
--- a/mysql-test/suite/parts/r/partition_alter1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result
--- a/mysql-test/suite/parts/r/partition_alter2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result
--- 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
--- 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
--- a/mysql-test/suite/parts/r/partition_alter4_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result
--- 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
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
--- 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
--- 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 ,
--- 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
--- 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

--- 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"
--- 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
--- 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;

--- 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
    {
--- 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);
--- 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 */
  }