merge

author: Mattias Jonsson <mattiasj@mysql.com> 2008-07-09 15:15:11 +0200
committer: Mattias Jonsson <mattiasj@mysql.com> 2008-07-09 15:15:11 +0200
commit: c4b408f96dd2bccc279b602dfdb813155b908d48 (patch)
tree: 6f01a17c3bb6f302ffed3a639db0d445aa52bd80
parent: 5cf61bd3446a4e4d8334f407fcfe0bdfdfe5e116 (diff)
parent: d4b0fcc90ab5c1e5edc32c18a50e478f618bd5f4 (diff)
download: mariadb-git-c4b408f96dd2bccc279b602dfdb813155b908d48.tar.gz
18 files changed, 5557 insertions, 5416 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index f5a5c05b236..3bdaa270805 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -276,7 +276,8 @@ enum enum_commands {
   Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
   Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP,
   Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
-  Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR,
+  Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR, Q_LIST_FILES,
+  Q_LIST_FILES_WRITE_FILE, Q_LIST_FILES_APPEND_FILE,
 
   Q_UNKNOWN,			       /* Unknown command.   */
   Q_COMMENT,			       /* Comments, ignored. */
@@ -368,6 +369,9 @@ const char *command_names[]=
   "change_user",
   "mkdir",
   "rmdir",
+  "list_files",
+  "list_files_write_file",
+  "list_files_append_file",
 
   0
 };
@@ -2837,6 +2841,126 @@ void do_rmdir(struct st_command *command)
 
 
 /*
+  SYNOPSIS
+  get_list_files
+  ds          output
+  ds_dirname  dir to list
+  ds_wild     wild-card file pattern (can be empty)
+
+  DESCRIPTION
+  list all entries in directory (matching ds_wild if given)
+*/
+
+static int get_list_files(DYNAMIC_STRING *ds, const DYNAMIC_STRING *ds_dirname,
+                          const DYNAMIC_STRING *ds_wild)
+{
+  uint i;
+  MY_DIR *dir_info;
+  FILEINFO *file;
+  DBUG_ENTER("get_list_files");
+
+  DBUG_PRINT("info", ("listing directory: %s", ds_dirname->str));
+  /* Note that my_dir sorts the list if not given any flags */
+  if (!(dir_info= my_dir(ds_dirname->str, MYF(0))))
+    DBUG_RETURN(1);
+  for (i= 0; i < (uint) dir_info->number_off_files; i++)
+  {
+    file= dir_info->dir_entry + i;
+    if (file->name[0] == '.' &&
+        (file->name[1] == '\0' ||
+         (file->name[1] == '.' && file->name[2] == '\0')))
+      continue;                               /* . or .. */
+    if (ds_wild && ds_wild->length &&
+        wild_compare(file->name, ds_wild->str, 0))
+      continue;
+    dynstr_append(ds, file->name);
+    dynstr_append(ds, "\n");
+  }
+  my_dirend(dir_info);
+  DBUG_RETURN(0);
+}
+
+
+/*
+  SYNOPSIS
+  do_list_files
+  command	called command
+
+  DESCRIPTION
+  list_files <dir_name> [<file_name>]
+  List files and directories in directory <dir_name> (like `ls`)
+  [Matching <file_name>, where wild-cards are allowed]
+*/
+
+static void do_list_files(struct st_command *command)
+{
+  int error;
+  static DYNAMIC_STRING ds_dirname;
+  static DYNAMIC_STRING ds_wild;
+  const struct command_arg list_files_args[] = {
+    {"dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to list"},
+    {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"}
+  };
+  DBUG_ENTER("do_list_files");
+
+  check_command_args(command, command->first_argument,
+                     list_files_args,
+                     sizeof(list_files_args)/sizeof(struct command_arg), ' ');
+
+  error= get_list_files(&ds_res, &ds_dirname, &ds_wild);
+  handle_command_error(command, error);
+  dynstr_free(&ds_dirname);
+  dynstr_free(&ds_wild);
+  DBUG_VOID_RETURN;
+}
+
+
+/*
+  SYNOPSIS
+  do_list_files_write_file_command
+  command       called command
+  append        append file, or create new
+
+  DESCRIPTION
+  list_files_{write|append}_file <filename> <dir_name> [<match_file>]
+  List files and directories in directory <dir_name> (like `ls`)
+  [Matching <match_file>, where wild-cards are allowed]
+
+  Note: File will be truncated if exists and append is not true.
+*/
+
+static void do_list_files_write_file_command(struct st_command *command,
+                                             my_bool append)
+{
+  int error;
+  static DYNAMIC_STRING ds_content;
+  static DYNAMIC_STRING ds_filename;
+  static DYNAMIC_STRING ds_dirname;
+  static DYNAMIC_STRING ds_wild;
+  const struct command_arg list_files_args[] = {
+    {"filename", ARG_STRING, TRUE, &ds_filename, "Filename for write"},
+    {"dirname", ARG_STRING, TRUE, &ds_dirname, "Directory to list"},
+    {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"}
+  };
+  DBUG_ENTER("do_list_files_write_file");
+
+  check_command_args(command, command->first_argument,
+                     list_files_args,
+                     sizeof(list_files_args)/sizeof(struct command_arg), ' ');
+
+  init_dynamic_string(&ds_content, "", 1024, 1024);
+  error= get_list_files(&ds_content, &ds_dirname, &ds_wild);
+  handle_command_error(command, error);
+  str_to_file2(ds_filename.str, ds_content.str, ds_content.length, append);
+  dynstr_free(&ds_content);
+  dynstr_free(&ds_filename);
+  dynstr_free(&ds_dirname);
+  dynstr_free(&ds_wild);
+  DBUG_VOID_RETURN;
+}
+
+
+/*
   Read characters from line buffer or file. This is needed to allow
   my_ungetc() to buffer MAX_DELIMITER_LENGTH characters for a file
 
@@ -7147,6 +7271,13 @@ int main(int argc, char **argv)
       case Q_REMOVE_FILE: do_remove_file(command); break;
       case Q_MKDIR: do_mkdir(command); break;
       case Q_RMDIR: do_rmdir(command); break;
+      case Q_LIST_FILES: do_list_files(command); break;
+      case Q_LIST_FILES_WRITE_FILE:
+        do_list_files_write_file_command(command, FALSE);
+        break;
+      case Q_LIST_FILES_APPEND_FILE:
+        do_list_files_write_file_command(command, TRUE);
+        break;
       case Q_FILE_EXIST: do_file_exist(command); break;
       case Q_WRITE_FILE: do_write_file(command); break;
       case Q_APPEND_FILE: do_append_file(command); break;
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index adf99185d89..6ceed6b8d14 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -725,6 +725,9 @@ drop table t1;
 mysqltest: At line 1: change user failed: Unknown database 'inexistent'
 mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO)
 mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES)
+file1.txt
+file1.txt
+file2.txt
 SELECT 'c:\\a.txt' AS col;
 col
 z
diff --git a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
index 34a921374e6..1ab12e738ab 100644
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc
@@ -11,9 +11,6 @@
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
 # Original Date: 2006-05-12                                                    #
-# Change Author:                                                               #
-# Change Date:                                                                 #
-# Change:                                                                      #
 ################################################################################
 
 if ($no_debug)
@@ -23,25 +20,26 @@ if ($no_debug)
 
 if ($do_file_tests)
 {
+let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--list_files_write_file $ls_file $MYSQLTEST_VARDIR/master-data/test t1*
+--chmod 0644 $ls_file
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/tmp/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--list_files_append_file $ls_file $MYSQLTEST_VARDIR/tmp t1*
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
-let $file_list= `SELECT @aux`;
+eval SET @aux = load_file('$ls_file');
 }
 if (!$do_file_tests)
 {
-let $file_list= '--- not determined ---';
+SET @aux = '--- not determined ---';
 }
 
 # UPDATE the current filelist of the table t1 within t0_definition
 # Note: This list should be empty, because the table t1 was dropped !
-eval INSERT INTO t0_definition SET state = 'old', file_list = $file_list
-ON DUPLICATE KEY UPDATE file_list = $file_list;
-# eval UPDATE t0_definition SET file_list = $file_list WHERE state = 'old';
+eval INSERT INTO t0_definition SET state = 'old', file_list = @aux
+ON DUPLICATE KEY UPDATE file_list = @aux;
+# eval UPDATE t0_definition SET file_list = @aux WHERE state = 'old';
 
 # Check if filelist is empty.
 let $found_garbage= `SELECT file_list <> '' FROM t0_definition WHERE state = 'old'`;
diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc
index c4181ef1cfd..23872b7ff1f 100644
--- a/mysql-test/suite/parts/inc/partition_layout.inc
+++ b/mysql-test/suite/parts/inc/partition_layout.inc
@@ -10,5 +10,5 @@ eval SHOW CREATE TABLE t1;
 if ($ls)
 {
    --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+   --list_files $MYSQLTEST_VARDIR/master-data/test t1*
 }
diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
index 587339e123e..fb5887f9124 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc
@@ -38,12 +38,12 @@ if ($do_file_tests)
 {
 # List the files belonging to the table t1
 let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
-let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
+--list_files_write_file $ls_file $MYSQLTEST_VARDIR/master-data/test t1*
+--chmod 0644 $ls_file
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
+--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-data-dir t1*
+--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
 }
 eval SET @aux = load_file('$ls_file');
 }
diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
index 2f42fb90c14..17dc0016b1d 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc
@@ -14,9 +14,6 @@
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
-# Change Author:                                                               #
-# Change Date:                                                                 #
-# Change:                                                                      #
 ################################################################################
 
 if ($no_debug)
@@ -34,12 +31,12 @@ if ($do_file_tests)
 {
 # List the files belonging to the table t1
 let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
-let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
+--list_files_write_file $ls_file $MYSQLTEST_VARDIR/master-data/test t1*
+--chmod 0644 $ls_file
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
+--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-data-dir t1*
+--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
 }
 eval SET @aux = load_file('$ls_file');
 }
diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
index 7533b42340f..d93377694a6 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
@@ -77,12 +77,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -592,18 +592,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1121,24 +1121,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1654,20 +1654,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2179,24 +2179,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2712,24 +2712,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3245,24 +3245,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3776,26 +3776,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4306,12 +4306,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4821,18 +4821,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5350,24 +5350,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5883,20 +5883,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6408,24 +6408,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6941,24 +6941,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7474,24 +7474,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8005,26 +8005,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
index 98fa8fdfe61..3b6832d06ae 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
@@ -236,12 +236,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -751,18 +751,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1280,24 +1280,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1813,20 +1813,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2338,24 +2338,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2873,24 +2873,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3406,24 +3406,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3937,26 +3937,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4467,12 +4467,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4982,18 +4982,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5511,24 +5511,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6044,20 +6044,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6569,24 +6569,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7104,24 +7104,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7637,24 +7637,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8168,26 +8168,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
index 31d6d4f54f6..ce80c58aa3a 100644
--- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
@@ -74,12 +74,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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -537,18 +537,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1014,24 +1014,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1495,20 +1495,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1968,24 +1968,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2451,24 +2451,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2932,24 +2932,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3411,26 +3411,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3893,12 +3893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4356,18 +4356,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4833,24 +4833,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5314,20 +5314,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5787,24 +5787,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6268,24 +6268,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6749,24 +6749,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7228,26 +7228,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7706,12 +7706,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8169,18 +8169,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8646,24 +8646,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9127,20 +9127,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9600,24 +9600,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10081,24 +10081,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10562,24 +10562,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11041,26 +11041,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11519,12 +11519,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11982,18 +11982,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12459,24 +12459,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12940,20 +12940,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13413,24 +13413,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13894,24 +13894,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14375,24 +14375,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14854,26 +14854,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result
index df243a115cc..4111a19ace5 100644
--- a/mysql-test/suite/parts/r/partition_alter2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result
@@ -76,12 +76,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -539,18 +539,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1016,24 +1016,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1497,20 +1497,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1970,24 +1970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2453,24 +2453,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2934,24 +2934,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3413,26 +3413,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3893,12 +3893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4408,18 +4408,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4937,24 +4937,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5470,20 +5470,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5995,24 +5995,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6530,24 +6530,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7063,24 +7063,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7594,26 +7594,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8124,12 +8124,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8639,18 +8639,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9168,24 +9168,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9701,20 +9701,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10226,24 +10226,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10761,24 +10761,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11294,24 +11294,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11825,26 +11825,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12359,12 +12359,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12822,18 +12822,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13299,24 +13299,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13780,20 +13780,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14253,24 +14253,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14736,24 +14736,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15217,24 +15217,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15696,26 +15696,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16174,12 +16174,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16637,18 +16637,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17114,24 +17114,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17595,20 +17595,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18068,24 +18068,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18549,24 +18549,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19030,24 +19030,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19509,26 +19509,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19989,12 +19989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20504,18 +20504,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21033,24 +21033,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21566,20 +21566,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22091,24 +22091,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22626,24 +22626,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23159,24 +23159,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23690,26 +23690,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24220,12 +24220,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24735,18 +24735,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25264,24 +25264,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25797,20 +25797,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26322,24 +26322,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26855,24 +26855,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27388,24 +27388,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27919,26 +27919,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28449,12 +28449,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28964,18 +28964,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29493,24 +29493,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30026,20 +30026,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30551,24 +30551,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31086,24 +31086,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31619,24 +31619,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32150,26 +32150,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32680,12 +32680,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33195,18 +33195,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33724,24 +33724,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34257,20 +34257,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34782,24 +34782,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35315,24 +35315,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35848,24 +35848,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36379,26 +36379,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36917,12 +36917,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37382,18 +37382,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37861,24 +37861,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38344,20 +38344,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38817,24 +38817,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39302,24 +39302,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39783,24 +39783,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40264,26 +40264,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40746,12 +40746,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41263,18 +41263,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41794,24 +41794,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42329,20 +42329,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42854,24 +42854,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43391,24 +43391,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43924,24 +43924,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44457,26 +44457,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44989,12 +44989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -45506,18 +45506,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46037,24 +46037,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46572,20 +46572,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47097,24 +47097,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47634,24 +47634,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48167,24 +48167,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48700,26 +48700,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49235,12 +49235,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49701,18 +49701,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50181,24 +50181,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50665,20 +50665,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51143,24 +51143,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51629,24 +51629,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52115,24 +52115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52597,26 +52597,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53078,12 +53078,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53544,18 +53544,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54024,24 +54024,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54508,20 +54508,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54986,24 +54986,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55472,24 +55472,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55958,24 +55958,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56440,26 +56440,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56923,12 +56923,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57441,18 +57441,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57973,24 +57973,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -58509,20 +58509,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59039,24 +59039,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59577,24 +59577,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60115,24 +60115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60649,26 +60649,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61182,12 +61182,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61700,18 +61700,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62232,24 +62232,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62768,20 +62768,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63298,24 +63298,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63836,24 +63836,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64374,24 +64374,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64908,26 +64908,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65441,12 +65441,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65959,18 +65959,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66491,24 +66491,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67027,20 +67027,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67557,24 +67557,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68095,24 +68095,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68633,24 +68633,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69167,26 +69167,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69700,12 +69700,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70218,18 +70218,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70750,24 +70750,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71286,20 +71286,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71816,24 +71816,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72354,24 +72354,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72892,24 +72892,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73426,26 +73426,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result
index 898d6cbb42a..888f9515a9c 100644
--- a/mysql-test/suite/parts/r/partition_alter3_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result
@@ -56,7 +56,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+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
+t1.frm
+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
+t1.frm
+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
+t1.frm
+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
+t1.frm
+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	20	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
+t1.frm
+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
@@ -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
+t1.frm
+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
@@ -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
+t1.frm
+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	20	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
+t1.frm
+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	20	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
+t1.frm
+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
@@ -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
+t1.frm
+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
@@ -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
+t1.frm
+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	20	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
+t1.frm
+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
@@ -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
+t1.frm
+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
+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
+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
+t1.frm
+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
+t1.frm
+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	20	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
+t1.frm
+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	20	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
+t1.frm
+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	20	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
+t1.frm
+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
@@ -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
+t1.frm
+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	20	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
+t1.frm
+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	23	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
+t1.frm
+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	20	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
+t1.frm
+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	20	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
+t1.frm
+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
@@ -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
+t1.frm
+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
+t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result
index 04dd90ebdfc..488434d8d74 100644
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result
@@ -56,9 +56,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+t1.MYD
+t1.MYI
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#p6.MYD
+t1#P#p6.MYI
+t1#P#p7.MYD
+t1#P#p7.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#p6.MYD
+t1#P#p6.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1.MYD
+t1.MYI
+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
+t1.MYD
+t1.MYI
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#p6.MYD
+t1#P#p6.MYI
+t1#P#p7.MYD
+t1#P#p7.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#p6.MYD
+t1#P#p6.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part7.MYD
+t1#P#part7.MYI
+t1.frm
+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	20	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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1.frm
+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
@@ -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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1.MYD
+t1.MYI
+t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result
index 7f5e7df6061..1c340d913bf 100644
--- a/mysql-test/suite/parts/r/partition_basic_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result
@@ -75,8 +75,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -527,8 +527,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -987,8 +987,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1445,8 +1445,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1899,8 +1899,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2359,8 +2359,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2821,8 +2821,8 @@ t1	CREATE TABLE `t1` (
 ) 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 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3277,8 +3277,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3731,8 +3731,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4183,8 +4183,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4643,8 +4643,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5101,8 +5101,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5555,8 +5555,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6013,8 +6013,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6471,8 +6471,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6927,8 +6927,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7387,8 +7387,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7876,8 +7876,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8373,8 +8373,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8868,8 +8868,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9359,8 +9359,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9856,8 +9856,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10355,8 +10355,8 @@ t1	CREATE TABLE `t1` (
 ) 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 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10848,8 +10848,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11338,8 +11338,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11827,8 +11827,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12324,8 +12324,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12819,8 +12819,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13310,8 +13310,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13807,8 +13807,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14306,8 +14306,8 @@ t1	CREATE TABLE `t1` (
 ) 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 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14799,8 +14799,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15289,8 +15289,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15794,8 +15794,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16307,8 +16307,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16818,8 +16818,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17325,8 +17325,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17838,8 +17838,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18353,8 +18353,8 @@ t1	CREATE TABLE `t1` (
 ) 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 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18862,8 +18862,8 @@ t1	CREATE TABLE `t1` (
 ) 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) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19373,8 +19373,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19862,8 +19862,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20359,8 +20359,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20854,8 +20854,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21345,8 +21345,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21840,8 +21840,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22335,8 +22335,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22828,8 +22828,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23318,8 +23318,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23807,8 +23807,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24304,8 +24304,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24799,8 +24799,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25290,8 +25290,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25785,8 +25785,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26280,8 +26280,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26773,8 +26773,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27263,8 +27263,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27768,8 +27768,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28281,8 +28281,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) ENGINE = InnoDB, PARTITION part0 VALUES IN (0) ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) ENGINE = InnoDB, PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28792,8 +28792,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29299,8 +29299,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29810,8 +29810,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = InnoDB, SUBPARTITION subpart12 ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = InnoDB, SUBPARTITION subpart22 ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = InnoDB, SUBPARTITION subpart32 ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30321,8 +30321,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = InnoDB, SUBPARTITION sp12 ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = InnoDB, SUBPARTITION sp22 ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = InnoDB, SUBPARTITION sp32 ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = InnoDB, SUBPARTITION sp42 ENGINE = InnoDB)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30830,8 +30830,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB, PARTITION part2 VALUES IN (1) ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result
index 4d1f160eace..72592d8ee92 100644
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
@@ -75,12 +75,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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -533,18 +533,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1005,24 +1005,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1481,20 +1481,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1949,24 +1949,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2427,24 +2427,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2907,24 +2907,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3381,26 +3381,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3855,12 +3855,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4313,18 +4313,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4785,24 +4785,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5261,20 +5261,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5729,24 +5729,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6205,24 +6205,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6681,24 +6681,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7155,26 +7155,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7635,12 +7635,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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8146,18 +8146,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8671,24 +8671,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9200,20 +9200,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9721,24 +9721,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10252,24 +10252,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10785,24 +10785,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11312,26 +11312,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11843,12 +11843,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12354,18 +12354,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12879,24 +12879,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13408,20 +13408,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13929,24 +13929,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14458,24 +14458,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14987,24 +14987,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15514,26 +15514,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
index c97bdbec83e..658e255dfac 100644
--- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
@@ -85,16 +85,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -562,28 +562,28 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p3.MYD
+t1#P#p4.MYD
+t1#P#p5.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
+t1#P#p3.MYI
+t1#P#p4.MYI
+t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1052,40 +1052,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
+t1#P#part0.MYD
+t1#P#part1.MYD
+t1#P#part2.MYD
+t1#P#part3.MYD
+t1#P#part_1.MYD
+t1#P#part_2.MYD
+t1#P#part_3.MYD
+t1#P#part_N.MYD
+t1#P#part0.MYI
+t1#P#part1.MYI
+t1#P#part2.MYI
+t1#P#part3.MYI
+t1#P#part_1.MYI
+t1#P#part_2.MYI
+t1#P#part_3.MYI
+t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1556,32 +1556,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
+t1#P#parta.MYD
+t1#P#partb.MYD
+t1#P#partc.MYD
+t1#P#partd.MYD
+t1#P#parte.MYD
+t1#P#partf.MYD
+t1#P#parta.MYI
+t1#P#partb.MYI
+t1#P#partc.MYI
+t1#P#partd.MYI
+t1#P#parte.MYI
+t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2044,40 +2044,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp1.MYD
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp1.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2542,40 +2542,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart12.MYD
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart22.MYD
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart32.MYD
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart42.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3058,40 +3058,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp12.MYD
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp22.MYD
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp32.MYD
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp42.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3554,44 +3554,44 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4052,16 +4052,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4529,28 +4529,28 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p3.MYD
+t1#P#p4.MYD
+t1#P#p5.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
+t1#P#p3.MYI
+t1#P#p4.MYI
+t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5019,40 +5019,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
+t1#P#part0.MYD
+t1#P#part1.MYD
+t1#P#part2.MYD
+t1#P#part3.MYD
+t1#P#part_1.MYD
+t1#P#part_2.MYD
+t1#P#part_3.MYD
+t1#P#part_N.MYD
+t1#P#part0.MYI
+t1#P#part1.MYI
+t1#P#part2.MYI
+t1#P#part3.MYI
+t1#P#part_1.MYI
+t1#P#part_2.MYI
+t1#P#part_3.MYI
+t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5523,32 +5523,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
+t1#P#parta.MYD
+t1#P#partb.MYD
+t1#P#partc.MYD
+t1#P#partd.MYD
+t1#P#parte.MYD
+t1#P#partf.MYD
+t1#P#parta.MYI
+t1#P#partb.MYI
+t1#P#partc.MYI
+t1#P#partd.MYI
+t1#P#parte.MYI
+t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6011,40 +6011,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp1.MYD
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp1.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6507,40 +6507,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart12.MYD
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart22.MYD
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart32.MYD
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart42.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7023,40 +7023,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp12.MYD
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp22.MYD
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp32.MYD
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp42.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7519,44 +7519,44 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8023,16 +8023,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8553,28 +8553,28 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p3.MYD
+t1#P#p4.MYD
+t1#P#p5.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
+t1#P#p3.MYI
+t1#P#p4.MYI
+t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9096,40 +9096,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
+t1#P#part0.MYD
+t1#P#part1.MYD
+t1#P#part2.MYD
+t1#P#part3.MYD
+t1#P#part_1.MYD
+t1#P#part_2.MYD
+t1#P#part_3.MYD
+t1#P#part_N.MYD
+t1#P#part0.MYI
+t1#P#part1.MYI
+t1#P#part2.MYI
+t1#P#part3.MYI
+t1#P#part_1.MYI
+t1#P#part_2.MYI
+t1#P#part_3.MYI
+t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9653,32 +9653,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
+t1#P#parta.MYD
+t1#P#partb.MYD
+t1#P#partc.MYD
+t1#P#partd.MYD
+t1#P#parte.MYD
+t1#P#partf.MYD
+t1#P#parta.MYI
+t1#P#partb.MYI
+t1#P#partc.MYI
+t1#P#partd.MYI
+t1#P#parte.MYI
+t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10194,40 +10194,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp1.MYD
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp1.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10745,40 +10745,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart12.MYD
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart22.MYD
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart32.MYD
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart42.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11314,40 +11314,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp12.MYD
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp22.MYD
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp32.MYD
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp42.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11863,44 +11863,44 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12418,16 +12418,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12948,28 +12948,28 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p2.MYD
+t1#P#p3.MYD
+t1#P#p4.MYD
+t1#P#p5.MYD
+t1#P#p1.MYI
+t1#P#p2.MYI
+t1#P#p3.MYI
+t1#P#p4.MYI
+t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13491,40 +13491,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_N.MYI
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
+t1#P#part0.MYD
+t1#P#part1.MYD
+t1#P#part2.MYD
+t1#P#part3.MYD
+t1#P#part_1.MYD
+t1#P#part_2.MYD
+t1#P#part_3.MYD
+t1#P#part_N.MYD
+t1#P#part0.MYI
+t1#P#part1.MYI
+t1#P#part2.MYI
+t1#P#part3.MYI
+t1#P#part_1.MYI
+t1#P#part_2.MYI
+t1#P#part_3.MYI
+t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14048,32 +14048,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
+t1#P#parta.MYD
+t1#P#partb.MYD
+t1#P#partc.MYD
+t1#P#partd.MYD
+t1#P#parte.MYD
+t1#P#partf.MYD
+t1#P#parta.MYI
+t1#P#partb.MYI
+t1#P#partc.MYI
+t1#P#partd.MYI
+t1#P#parte.MYI
+t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14589,40 +14589,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp1.MYD
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp1.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15138,40 +15138,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#subpart42.MYI
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart12.MYD
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart22.MYD
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart32.MYD
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart42.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15707,40 +15707,40 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp12.MYD
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp22.MYD
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp32.MYD
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp42.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16256,44 +16256,44 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#part3sp2.MYI
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part3#SP#part3sp2.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp2.MYD
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp2.MYD
+t1#P#part3#SP#part3sp0.MYD
+t1#P#part3#SP#part3sp1.MYD
+t1#P#part3#SP#part3sp2.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part1#SP#part1sp2.MYI
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYI
+t1#P#part2#SP#part2sp2.MYI
+t1#P#part3#SP#part3sp0.MYI
+t1#P#part3#SP#part3sp1.MYI
+t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16807,14 +16807,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1.frm
+t1.par
+t1#P#p1.MYI
+t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17330,23 +17330,23 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p5.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1#P#p2.MYD
+t1#P#p2.MYI
+t1#P#p3.MYD
+t1#P#p3.MYI
+t1#P#p4.MYD
+t1#P#p4.MYI
+t1#P#p5.MYD
+t1#P#p5.MYI
+t1.frm
+t1.par
+t1#P#p1.MYD
+t1#P#p3.MYD
+t1#P#p2.MYI
+t1#P#p3.MYI
+t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17868,33 +17868,33 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part_3.MYI
+t1#P#part0.MYD
+t1#P#part0.MYI
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1#P#part_1.MYD
+t1#P#part_1.MYI
+t1#P#part_2.MYD
+t1#P#part_2.MYI
+t1#P#part_3.MYD
+t1#P#part_3.MYI
+t1#P#part_N.MYD
+t1#P#part_N.MYI
+t1.frm
+t1.par
+t1#P#part2.MYD
+t1#P#part3.MYD
+t1#P#part_1.MYD
+t1#P#part_2.MYD
+t1#P#part_N.MYD
+t1#P#part0.MYI
+t1#P#part3.MYI
+t1#P#part_1.MYI
+t1#P#part_3.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18412,26 +18412,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partf.MYI
+t1#P#parta.MYD
+t1#P#parta.MYI
+t1#P#partb.MYD
+t1#P#partb.MYI
+t1#P#partc.MYD
+t1#P#partc.MYI
+t1#P#partd.MYD
+t1#P#partd.MYI
+t1#P#parte.MYD
+t1#P#parte.MYI
+t1#P#partf.MYD
+t1#P#partf.MYI
+t1.frm
+t1.par
+t1#P#partb.MYD
+t1#P#partc.MYD
+t1#P#parte.MYD
+t1#P#parta.MYI
+t1#P#partc.MYI
+t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18943,32 +18943,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#partd#SP#partdsp1.MYI
+t1#P#parta#SP#partasp0.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYD
+t1#P#parta#SP#partasp1.MYI
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp0.MYI
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partb#SP#partbsp1.MYI
+t1#P#partc#SP#partcsp0.MYD
+t1#P#partc#SP#partcsp0.MYI
+t1#P#partc#SP#partcsp1.MYD
+t1#P#partc#SP#partcsp1.MYI
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYD
+t1#P#partd#SP#partdsp1.MYI
+t1.frm
+t1.par
+t1#P#partb#SP#partbsp0.MYD
+t1#P#partb#SP#partbsp1.MYD
+t1#P#partd#SP#partdsp0.MYD
+t1#P#partd#SP#partdsp1.MYD
+t1#P#parta#SP#partasp0.MYI
+t1#P#parta#SP#partasp1.MYI
+t1#P#partd#SP#partdsp0.MYI
+t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19486,32 +19486,32 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#subpart32.MYI
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1#P#part4#SP#subpart41.MYD
+t1#P#part4#SP#subpart41.MYI
+t1#P#part4#SP#subpart42.MYD
+t1#P#part4#SP#subpart42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart12.MYD
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart32.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20039,38 +20039,38 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/mysql-test-data-dir/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#part4#SP#sp42.MYI
+t1#P#part1#SP#sp11.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYD
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp21.MYI
+t1#P#part2#SP#sp22.MYD
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYD
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYD
+t1#P#part4#SP#sp42.MYI
+t1.frm
+t1.par
+t1#P#part1#SP#sp11.MYD
+t1#P#part2#SP#sp21.MYD
+t1#P#part2#SP#sp22.MYD
+t1#P#part3#SP#sp31.MYD
+t1#P#part3#SP#sp32.MYD
+t1#P#part4#SP#sp41.MYD
+t1#P#part4#SP#sp42.MYD
+t1#P#part1#SP#sp11.MYI
+t1#P#part1#SP#sp12.MYI
+t1#P#part2#SP#sp22.MYI
+t1#P#part3#SP#sp31.MYI
+t1#P#part3#SP#sp32.MYI
+t1#P#part4#SP#sp41.MYI
+t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result
index 2dfea58995e..79fdfbb62b0 100644
--- a/mysql-test/suite/parts/r/partition_engine_myisam.result
+++ b/mysql-test/suite/parts/r/partition_engine_myisam.result
@@ -70,12 +70,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1.frm
+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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1529,16 +1529,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2035,16 +2035,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2502,16 +2502,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2969,12 +2969,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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3434,16 +3434,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3904,16 +3904,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4367,10 +4367,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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4826,12 +4826,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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1.frm
+t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result
index 93cb075ce2f..ab2a5797cd7 100644
--- a/mysql-test/suite/parts/r/partition_syntax_myisam.result
+++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result
@@ -662,12 +662,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1.frm
+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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1#P#part3.MYD
+t1#P#part3.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1.frm
+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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1#P#part3#SP#subpart31.MYD
+t1#P#part3#SP#subpart31.MYI
+t1#P#part3#SP#subpart32.MYD
+t1#P#part3#SP#subpart32.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1#P#p1.MYD
+t1#P#p1.MYI
+t1.frm
+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
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part1#SP#part1sp1.MYD
+t1#P#part1#SP#part1sp1.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1#P#part2#SP#part2sp1.MYD
+t1#P#part2#SP#part2sp1.MYI
+t1.frm
+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
+t1#P#p0.MYD
+t1#P#p0.MYI
+t1.frm
+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
+t1#P#part1#SP#part1sp0.MYD
+t1#P#part1#SP#part1sp0.MYI
+t1#P#part2#SP#part2sp0.MYD
+t1#P#part2#SP#part2sp0.MYI
+t1.frm
+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
+t1#P#part1.MYD
+t1#P#part1.MYI
+t1#P#part2.MYD
+t1#P#part2.MYI
+t1.frm
+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
+t1#P#part1#SP#subpart11.MYD
+t1#P#part1#SP#subpart11.MYI
+t1#P#part1#SP#subpart12.MYD
+t1#P#part1#SP#subpart12.MYI
+t1#P#part2#SP#subpart21.MYD
+t1#P#part2#SP#subpart21.MYI
+t1#P#part2#SP#subpart22.MYD
+t1#P#part2#SP#subpart22.MYI
+t1.frm
+t1.par
 
 DROP TABLE t1;
 # 4.3.2 (positive) number of partition/subpartition ,
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index b41f033d2af..5a96415d2d9 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -2117,10 +2117,22 @@ mkdir $MYSQLTEST_VARDIR/tmp/testdir;
 write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;
 hello
 EOF
+
+list_files $MYSQLTEST_VARDIR/tmp/testdir;
+# list_files gets the directory list before creating the new file
+list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *;
+list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *2*;
+list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir file?.txt;
+list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt $MYSQLTEST_VARDIR/tmp/testdir file*.txt;
+diff_files $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
 --error 1
 rmdir $MYSQLTEST_VARDIR/tmp/testdir;
 
+cat_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
+
 remove_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;
+remove_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt;
+remove_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
 rmdir $MYSQLTEST_VARDIR/tmp/testdir;
 
 #
author	Mattias Jonsson <mattiasj@mysql.com>	2008-07-09 15:15:11 +0200
committer	Mattias Jonsson <mattiasj@mysql.com>	2008-07-09 15:15:11 +0200
commit	c4b408f96dd2bccc279b602dfdb813155b908d48 (patch)
tree	6f01a17c3bb6f302ffed3a639db0d445aa52bd80
parent	5cf61bd3446a4e4d8334f407fcfe0bdfdfe5e116 (diff)
parent	d4b0fcc90ab5c1e5edc32c18a50e478f618bd5f4 (diff)
download	mariadb-git-c4b408f96dd2bccc279b602dfdb813155b908d48.tar.gz