Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-parts

into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/lib/mtr_cases.pm: Auto merged
author: unknown <msvensson@pilot.mysql.com> 2008-01-10 17:17:04 +0100
committer: unknown <msvensson@pilot.mysql.com> 2008-01-10 17:17:04 +0100
commit: 0a69b0b833c451ff1357c3bf8bb3b01dbe398a8c (patch)
tree: 71589b8c20166b30b1d850e851279ed814926a87 /mysql-test
parent: 3435acd71eab5945fa2d659803db0ed356104659 (diff)
parent: c6a1ed022cc938f3a8d9590314db6904ad863321 (diff)
download: mariadb-git-0a69b0b833c451ff1357c3bf8bb3b01dbe398a8c.tar.gz
21 files changed, 6186 insertions, 6172 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 5dc76db99e4..16d4da39667 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -894,8 +894,19 @@ sub collect_one_test_case {
     my $config= "$suitedir/my.cnf";
     if (! -f $config )
     {
-      # Suite has no config, use default.cnf
+      # assume default.cnf will be used
       $config= "include/default_my.cnf";
+
+      # Suite has no config, autodetect which one to use
+      if ( $tinfo->{rpl_test} ){
+	$config= "suite/rpl/my.cnf";
+	if ( $tinfo->{ndb_test} ){
+	  $config= "suite/rpl_ndb/my.cnf";
+	}
+      }
+      elsif ( $tinfo->{ndb_test} ){
+	$config= "suite/ndb/my.cnf";
+      }
     }
     $tinfo->{template_path}= $config;
   }
diff --git a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre
index 0c906ce4581..7c3b0d9d1ef 100644
--- a/mysql-test/suite/parts/inc/partition.pre
+++ b/mysql-test/suite/parts/inc/partition.pre
@@ -246,7 +246,7 @@ if (0)
 # Option, for displaying files:
 #     $ls= 1 (default)
 #          --> Display the table related directory content via
-#                "ls $MYSQLTEST_VARDIR/master-data/test/t1*"
+#                "ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*"
 #              if these informations were collected.
 #              This is probably not portable to some OS.
 #     $ls= 0
@@ -410,7 +410,7 @@ if (0)
 # 3. How to analyze a partitioning bug revealed with these tests/ How to build
 #    a small replay script from the monstrous protocols ?
 #------------------------------------------------------------------------------#
-# a) crash    -- use the file var/master-data/mysql/general_log.CSV
+# a) crash    -- use the file var/mysqld.1/data/mysql/general_log.CSV
 # b) no crash, but unexpected server response (there is no "reject file)
 #             -- use the file r/<testcase>.log
 #                Please be aware that the option $debug= 0 suppresses the
diff --git a/mysql-test/suite/parts/inc/partition_basic.inc b/mysql-test/suite/parts/inc/partition_basic.inc
index a5815d3b71c..72673a0d535 100644
--- a/mysql-test/suite/parts/inc/partition_basic.inc
+++ b/mysql-test/suite/parts/inc/partition_basic.inc
@@ -35,16 +35,16 @@ let $unique= ;
    --disable_query_log
    # DATA DIRECTORY
    # Make directory for partition data
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true
    eval SET @data_dir = 'DATA DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data''''';
    let $data_directory = `select @data_dir`;
 
    #INDEX DIRECTORY
    # Make directory for partition index
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true
    eval SET @indx_dir = 'INDEX DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index''''';
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= 1;
@@ -78,16 +78,16 @@ if ($more_pk_ui_tests)
    --disable_query_log
    # DATA DIRECTORY
    # Make directory for partition data
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/data || true
    eval SET @data_dir = 'DATA DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/data''''';
    let $data_directory = `select @data_dir`;
 
    #INDEX DIRECTORY
    # Make directory for partition index
-   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true
+   --exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/test/index || true
    eval SET @indx_dir = 'INDEX DIRECTORY =
-   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';
+   ''''$MYSQLTEST_VARDIR/mysqld.1/data/test/index''''';
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= TRUE;
diff --git a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
index 88ebdb7ad48..1e06fbdd156 100644
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc
@@ -24,13 +24,13 @@ if ($no_debug)
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -62,11 +62,11 @@ if ($found_garbage)
    }
    # Do a manual cleanup, because the following tests should not suffer from
    # remaining files
-   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/t1* || true
+   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* || true
    if ($with_directories)
    {
-	   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/data/t1* || true
-	   --exec rm -f $MYSQLTEST_VARDIR/master-data/test/index/t1* || true
+	   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* || true
+	   --exec rm -f $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* || true
    }
 }
 --enable_query_log
diff --git a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc
index c4181ef1cfd..b9835cb4d55 100644
--- a/mysql-test/suite/parts/inc/partition_layout.inc
+++ b/mysql-test/suite/parts/inc/partition_layout.inc
@@ -10,5 +10,5 @@ eval SHOW CREATE TABLE t1;
 if ($ls)
 {
    --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+   --exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*
 }
diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
index 9989f4ed9e3..3d8f634603b 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc
@@ -31,17 +31,17 @@ DELETE FROM t0_definition;
 # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than
 #   the corresponding SELECT on the INFORMATION_SCHEMA
 # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/master-data/test/data/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/master-data/test/index/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1* >> $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2''
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2''
 )');
 let $file_list= `SELECT @aux`;
 }
@@ -52,7 +52,7 @@ let $file_list= '--- not determined ---';
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'old',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
+     create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'),
      file_list      = $file_list;
 
 # Print the create table statement into the protocol
diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
index 05c44a73a7f..1cd4fe5aa8d 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc
@@ -27,12 +27,12 @@ if ($no_debug)
 DELETE FROM t0_definition WHERE state = 'new';
 
 # Dump the current definition of the table t1 to tmp1
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1 2>&1 || true
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+--exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1* > $MYSQLTEST_VARDIR/mysqld.1/data/test/tmp2 2>&1 || true
+eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/mysqld.1/data/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -42,7 +42,7 @@ let $file_list= '--- not determined ---';
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'new',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
+     create_command = load_file('$MYSQLTEST_VARDIR/mysqld.1/data/test/tmp1'),
      file_list      = $file_list;
 
 # Print the old and new table layout, if they differ
diff --git a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
index d9c1f5836f0..029b8676533 100644
--- a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
+++ b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
@@ -83,9 +83,12 @@ eval insert into t3 values ($val1);
 eval insert into t3 values ($val2);
 eval insert into t3 values ($val3);
 
-eval load data infile '../std_data_ln/parts/$infile' into table t4;
-eval load data infile '../std_data_ln/parts/$infile' into table t5;
-eval load data infile '../std_data_ln/parts/$infile' into table t6;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t4;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t5;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data infile '$MYSQLTEST_VARDIR/std_data/parts/$infile' into table t6;
 
 eval select $sqlfunc from t1 order by col1;
 
diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
index c47c22ed363..f73f175f635 100644
--- a/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values (17);
 insert into t3 values (5);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select mod(col1,10) from t1 order by col1;
 mod(col1,10)
 5
@@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -6423,9 +6423,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select datediff(col1, '2006-01-01') from t1 order by col1;
 datediff(col1, '2006-01-01')
 16
@@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
index f14f9517646..1150081e89b 100644
--- a/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values (17);
 insert into t3 values (5);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_int.inc' into table t6;
 select mod(col1,10) from t1 order by col1;
 mod(col1,10)
 5
@@ -3429,9 +3429,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -3925,9 +3925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -4421,9 +4421,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -4929,9 +4929,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5427,9 +5427,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5925,9 +5925,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -6423,9 +6423,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -6927,9 +6927,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -7417,9 +7417,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -7927,9 +7927,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8437,9 +8437,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8947,9 +8947,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -9451,9 +9451,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -9953,9 +9953,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -10461,9 +10461,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -10961,9 +10961,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select datediff(col1, '2006-01-01') from t1 order by col1;
 datediff(col1, '2006-01-01')
 16
@@ -11461,9 +11461,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -11961,9 +11961,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -12465,9 +12465,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t4;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t5;
-load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table t6;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQLTEST_VARDIR/std_data/parts/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/parts/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result
index 1058342aa8d..28e4523609e 100644
--- a/mysql-test/suite/parts/r/partition_alter1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result
@@ -236,12 +236,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -751,18 +751,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1280,24 +1280,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1813,20 +1813,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2338,24 +2338,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2873,24 +2873,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3406,24 +3406,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3937,26 +3937,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4467,12 +4467,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4982,18 +4982,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5511,24 +5511,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6044,20 +6044,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6569,24 +6569,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7104,24 +7104,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7637,24 +7637,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8168,26 +8168,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8703,12 +8703,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9218,18 +9218,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9747,24 +9747,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10280,20 +10280,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10805,24 +10805,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11338,24 +11338,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11871,24 +11871,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12402,26 +12402,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12932,12 +12932,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13447,18 +13447,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13976,24 +13976,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14509,20 +14509,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15034,24 +15034,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15567,24 +15567,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16100,24 +16100,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16631,26 +16631,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17167,12 +17167,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17630,18 +17630,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18107,24 +18107,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18588,20 +18588,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19061,24 +19061,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19544,24 +19544,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20025,24 +20025,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20504,26 +20504,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20986,12 +20986,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21449,18 +21449,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21926,24 +21926,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22407,20 +22407,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22880,24 +22880,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23361,24 +23361,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23842,24 +23842,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24321,26 +24321,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24799,12 +24799,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25262,18 +25262,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25739,24 +25739,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26220,20 +26220,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26693,24 +26693,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27174,24 +27174,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27655,24 +27655,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28134,26 +28134,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28612,12 +28612,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29075,18 +29075,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29552,24 +29552,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30033,20 +30033,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30506,24 +30506,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30987,24 +30987,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31468,24 +31468,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31947,26 +31947,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result
index 18abf7380c3..13996123d9f 100644
--- a/mysql-test/suite/parts/r/partition_alter2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result
@@ -76,12 +76,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -539,18 +539,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1016,24 +1016,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1497,20 +1497,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1970,24 +1970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2453,24 +2453,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2934,24 +2934,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3413,26 +3413,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3893,12 +3893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4408,18 +4408,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4937,24 +4937,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5470,20 +5470,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5995,24 +5995,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6530,24 +6530,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7063,24 +7063,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7594,26 +7594,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8124,12 +8124,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8639,18 +8639,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9168,24 +9168,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9701,20 +9701,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10226,24 +10226,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10761,24 +10761,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11294,24 +11294,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11825,26 +11825,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12359,12 +12359,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12822,18 +12822,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13299,24 +13299,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13780,20 +13780,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14253,24 +14253,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14736,24 +14736,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15217,24 +15217,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15696,26 +15696,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16174,12 +16174,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16637,18 +16637,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17114,24 +17114,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17595,20 +17595,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18068,24 +18068,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18549,24 +18549,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19030,24 +19030,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19509,26 +19509,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19989,12 +19989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20504,18 +20504,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21033,24 +21033,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21566,20 +21566,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22091,24 +22091,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22626,24 +22626,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23159,24 +23159,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23690,26 +23690,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24220,12 +24220,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24735,18 +24735,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25264,24 +25264,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25797,20 +25797,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26322,24 +26322,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26855,24 +26855,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27388,24 +27388,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27919,26 +27919,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28449,12 +28449,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28964,18 +28964,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29493,24 +29493,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30026,20 +30026,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30551,24 +30551,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31086,24 +31086,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31619,24 +31619,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32150,26 +32150,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32680,12 +32680,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33195,18 +33195,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33724,24 +33724,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34257,20 +34257,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34782,24 +34782,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35315,24 +35315,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35848,24 +35848,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36379,26 +36379,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36917,12 +36917,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37382,18 +37382,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37861,24 +37861,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38344,20 +38344,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38817,24 +38817,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39302,24 +39302,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39783,24 +39783,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40264,26 +40264,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40746,12 +40746,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41263,18 +41263,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41794,24 +41794,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42329,20 +42329,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42854,24 +42854,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43391,24 +43391,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43924,24 +43924,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44457,26 +44457,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -44989,12 +44989,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -45506,18 +45506,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46037,24 +46037,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -46572,20 +46572,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47097,24 +47097,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -47634,24 +47634,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48167,24 +48167,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -48700,26 +48700,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49235,12 +49235,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -49701,18 +49701,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50181,24 +50181,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -50665,20 +50665,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51143,24 +51143,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -51629,24 +51629,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52115,24 +52115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -52597,26 +52597,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53078,12 +53078,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -53544,18 +53544,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54024,24 +54024,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54508,20 +54508,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -54986,24 +54986,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55472,24 +55472,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -55958,24 +55958,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56440,26 +56440,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -56923,12 +56923,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57441,18 +57441,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -57973,24 +57973,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -58509,20 +58509,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59039,24 +59039,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -59577,24 +59577,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60115,24 +60115,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -60649,26 +60649,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61182,12 +61182,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -61700,18 +61700,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62232,24 +62232,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -62768,20 +62768,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63298,24 +63298,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -63836,24 +63836,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64374,24 +64374,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -64908,26 +64908,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65441,12 +65441,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -65959,18 +65959,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -66491,24 +66491,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67027,20 +67027,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -67557,24 +67557,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68095,24 +68095,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -68633,24 +68633,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69167,26 +69167,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -69700,12 +69700,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70218,18 +70218,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -70750,24 +70750,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71286,20 +71286,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -71816,24 +71816,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72354,24 +72354,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -72892,24 +72892,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -73426,26 +73426,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result
index 2ca1e783839..edeca8f55b3 100644
--- a/mysql-test/suite/parts/r/partition_alter3_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result
@@ -56,7 +56,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -77,8 +77,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -94,8 +94,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -109,8 +109,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -130,8 +130,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -149,8 +149,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -165,8 +165,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -193,8 +193,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -208,8 +208,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -223,8 +223,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -238,8 +238,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -253,8 +253,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -268,8 +268,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -283,8 +283,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -302,7 +302,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -341,7 +341,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -363,8 +363,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1)  */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -387,8 +387,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -406,8 +406,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -425,8 +425,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB, PARTITION p7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -451,8 +451,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB, PARTITION p6 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -469,8 +469,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB, PARTITION p5 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -487,8 +487,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB, PARTITION p4 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -505,8 +505,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB, PARTITION part2 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -523,8 +523,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB, PARTITION part7 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -541,8 +541,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB, PARTITION part1 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -559,8 +559,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = InnoDB) */
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -581,7 +581,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result
index 5684ca89b1c..1c897324adc 100644
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result
@@ -56,9 +56,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -79,10 +79,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -98,10 +98,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (DAYOFYEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -115,10 +115,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date))  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -138,14 +138,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -163,16 +163,16 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -187,24 +187,24 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -231,22 +231,22 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -260,20 +260,20 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -287,18 +287,18 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -312,16 +312,16 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -335,14 +335,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part1	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -356,12 +356,12 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -375,10 +375,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) (PARTITION p0 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -396,9 +396,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) FROM t1 WHERE f_date = '1000-02-10';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -431,9 +431,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -455,10 +455,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1)  */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -481,14 +481,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -506,16 +506,16 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -533,24 +533,24 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM, PARTITION p7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p6	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -575,22 +575,22 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM, PARTITION p6 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p6.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p6.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
@@ -607,20 +607,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM, PARTITION p5 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -637,18 +637,18 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM, PARTITION p4 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -665,16 +665,16 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	5	Using where
@@ -691,14 +691,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM, PARTITION part7 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part7.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part7.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	part7	ALL	NULL	NULL	NULL	NULL	7	Using where
@@ -715,12 +715,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	10	Using where
@@ -737,10 +737,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION p0 ENGINE = MyISAM) */
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
-MYSQLTEST_VARDIR/master-data/test/t1.par
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	20	Using where
@@ -761,9 +761,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-MYSQLTEST_VARDIR/master-data/test/t1.MYD
-MYSQLTEST_VARDIR/master-data/test/t1.MYI
-MYSQLTEST_VARDIR/master-data/test/t1.frm
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	20	Using where
diff --git a/mysql-test/suite/parts/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result
index 8eac8d414de..2e68b7710bd 100644
--- a/mysql-test/suite/parts/r/partition_alter4_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result
@@ -75,12 +75,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -538,18 +538,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1015,24 +1015,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1496,20 +1496,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1969,24 +1969,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2452,24 +2452,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2933,24 +2933,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3412,26 +3412,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3891,12 +3891,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4354,18 +4354,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4831,24 +4831,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5312,20 +5312,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5785,24 +5785,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6268,24 +6268,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6749,24 +6749,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7228,26 +7228,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8030,12 +8030,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8493,18 +8493,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8970,24 +8970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9451,20 +9451,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9924,24 +9924,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10407,24 +10407,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10888,24 +10888,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11367,26 +11367,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11846,12 +11846,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12309,18 +12309,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12786,24 +12786,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13267,20 +13267,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13740,24 +13740,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14223,24 +14223,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14704,24 +14704,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15183,26 +15183,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15985,12 +15985,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16448,18 +16448,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16925,24 +16925,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17406,20 +17406,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17879,24 +17879,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18362,24 +18362,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18843,24 +18843,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19322,26 +19322,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19801,12 +19801,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20264,18 +20264,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20741,24 +20741,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21222,20 +21222,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21695,24 +21695,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22178,24 +22178,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22659,24 +22659,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23138,26 +23138,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23940,12 +23940,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24403,18 +24403,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24880,24 +24880,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25361,20 +25361,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25834,24 +25834,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26317,24 +26317,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26798,24 +26798,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27277,26 +27277,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27756,12 +27756,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28219,18 +28219,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -28696,24 +28696,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29177,20 +29177,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -29650,24 +29650,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30133,24 +30133,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -30614,24 +30614,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31093,26 +31093,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -31895,12 +31895,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32358,18 +32358,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -32835,24 +32835,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33316,20 +33316,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -33789,24 +33789,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34272,24 +34272,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -34753,24 +34753,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35232,26 +35232,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -35711,12 +35711,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36174,18 +36174,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) (PARTITION part_1 ENGINE = MyISAM, PARTITION part_2 ENGINE = MyISAM, PARTITION part_3 ENGINE = MyISAM, PARTITION part_4 ENGINE = MyISAM, PARTITION part_5 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -36651,24 +36651,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37132,20 +37132,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_1 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION part_5 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -37605,24 +37605,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part_1 VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION part_2 VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION part_3 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part_4 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#part_4sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#part_4sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38088,24 +38088,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part_1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part_2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part_3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part_4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -38569,24 +38569,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part_1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part_2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part_3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part_4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39048,26 +39048,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM, PARTITION part_2 VALUES IN (1) ENGINE = MyISAM, PARTITION part_3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1#SP#part_1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2#SP#part_2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3#SP#part_3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1#SP#part_1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2#SP#part_2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3#SP#part_3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -39850,9 +39850,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40310,9 +40310,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -40778,9 +40778,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41244,9 +41244,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -41708,9 +41708,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42176,9 +42176,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -42644,9 +42644,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -43108,9 +43108,9 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result
index b9097e33ce0..d3e8cefeb45 100644
--- a/mysql-test/suite/parts/r/partition_basic_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result
@@ -3620,7 +3620,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4065,7 +4065,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4510,7 +4510,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4955,7 +4955,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5398,7 +5398,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5843,7 +5843,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6286,7 +6286,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6731,7 +6731,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8067,7 +8067,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8512,7 +8512,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8955,7 +8955,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9400,7 +9400,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = InnoDB, SUBPARTITION subpart42 ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9843,7 +9843,7 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14878,7 +14878,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15360,7 +15360,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15840,7 +15840,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16322,7 +16322,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16802,7 +16802,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17284,7 +17284,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18731,7 +18731,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19213,7 +19213,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19693,7 +19693,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20175,7 +20175,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20655,7 +20655,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21137,7 +21137,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22616,7 +22616,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23114,7 +23114,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23610,7 +23610,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24108,7 +24108,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24604,7 +24604,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB)) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB)) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25102,7 +25102,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = InnoDB) */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = InnoDB) */
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result
index 7e0d5bcd62a..fe490aa1b22 100644
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
@@ -66,12 +66,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -515,18 +515,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -970,24 +970,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1431,20 +1431,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1886,24 +1886,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2347,24 +2347,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2806,24 +2806,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3267,26 +3267,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3728,19 +3728,19 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4159,31 +4159,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -4199,31 +4199,31 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4642,31 +4642,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#p5.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p5.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p4.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#p5.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p4.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#p5.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -4682,43 +4682,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5137,31 +5137,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part_N.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_3.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part_N.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_3.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part_N.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -5177,35 +5177,35 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5622,31 +5622,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partf.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parte.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partf.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parte.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partf.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -5662,43 +5662,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6117,31 +6117,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#partd#SP#partdsp1.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#parta#SP#partasp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partb#SP#partbsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partc#SP#partcsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#partd#SP#partdsp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#parta#SP#partasp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partb#SP#partbsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partc#SP#partcsp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#partd#SP#partdsp1.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -6157,43 +6157,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6610,31 +6610,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#subpart42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#subpart12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#subpart22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#subpart32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#subpart42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#subpart12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#subpart22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#subpart32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#subpart42.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -6650,43 +6650,43 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7105,31 +7105,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part4#SP#sp42.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp11.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#sp12.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp21.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#sp22.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp31.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#sp32.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp41.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part4#SP#sp42.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp11.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#sp12.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp21.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#sp22.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp31.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#sp32.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp41.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part4#SP#sp42.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -7145,47 +7145,47 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7604,31 +7604,31 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 REPAIR   TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 state	new
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par 
 state	old
-Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */ 
-File list	MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/master-data/test/t1.frm MYSQLTEST_VARDIR/master-data/test/t1.par MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/master-data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/master-data/test/index/t1#P#part3#SP#part3sp2.MYI 
+Table definition	SHOW CREATE TABLE t1; Table	Create Table t1	CREATE TABLE `t1` (   `f_int1` int(11) DEFAULT NULL,   `f_int2` int(11) DEFAULT NULL,   `f_char1` char(20) DEFAULT NULL,   `f_char2` char(20) DEFAULT NULL,   `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */ 
+File list	MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part1#SP#part1sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part2#SP#part2sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp0.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp1.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/data/t1#P#part3#SP#part3sp2.MYD MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part1#SP#part1sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part2#SP#part2sp2.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp0.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp1.MYI MYSQLTEST_VARDIR/mysqld.1/data/test/index/t1#P#part3#SP#part3sp2.MYI 
 # check layout success:    0
 # End usability test (inc/partition_check.inc)
 DROP TABLE t1;
@@ -7648,12 +7648,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8097,18 +8097,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8549,27 +8549,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9010,23 +9010,23 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9465,27 +9465,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9926,27 +9926,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10385,27 +10385,27 @@ t1	CREATE TABLE `t1` (
   `f_char1` char(20) DEFAULT NULL,
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10860,12 +10860,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11318,18 +11318,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11790,24 +11790,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12266,20 +12266,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12734,24 +12734,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13210,24 +13210,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13686,24 +13686,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14160,26 +14160,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14631,12 +14631,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15133,18 +15133,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15638,27 +15638,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16152,23 +16152,23 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16660,27 +16660,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17174,27 +17174,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17686,27 +17686,27 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM)) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp22 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18200,29 +18200,29 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/master-data/test/index' ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/data' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysqld.1/data/test/index' ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18734,12 +18734,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19245,18 +19245,18 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p4.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19770,24 +19770,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part_N.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20299,20 +20299,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parte.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partf.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20820,24 +20820,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#parta#SP#partasp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partb#SP#partbsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partc#SP#partcsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#partd#SP#partdsp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21349,24 +21349,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#subpart42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21878,24 +21878,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#sp12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#sp22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#sp32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp41.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part4#SP#sp42.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22405,26 +22405,26 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#part3sp2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result
index f81becc6eea..9b6c3c9ed21 100644
--- a/mysql-test/suite/parts/r/partition_engine_myisam.result
+++ b/mysql-test/suite/parts/r/partition_engine_myisam.result
@@ -70,12 +70,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -534,12 +534,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -999,16 +999,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1465,12 +1465,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1925,12 +1925,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2390,16 +2390,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2857,16 +2857,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3328,16 +3328,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3795,16 +3795,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4262,12 +4262,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4727,16 +4727,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5196,16 +5196,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5659,10 +5659,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6118,12 +6118,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result
index 93cb075ce2f..ed610aafcfa 100644
--- a/mysql-test/suite/parts/r/partition_syntax_myisam.result
+++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result
@@ -662,12 +662,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 #  3.5.3 Reveal that IN (...NULL) is not mapped to IN(0)
@@ -694,14 +694,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,2)) (PARTITION part1 VALUES IN (NULL) ENGINE = MyISAM, PARTITION part2 VALUES IN (0) ENGINE = MyISAM, PARTITION part3 VALUES IN (1) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 
@@ -734,10 +734,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1)  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.1.2 no partition number, named partitions
@@ -761,12 +761,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.1.3 variations on no partition/subpartition number, named partitions,
@@ -852,20 +852,20 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (10) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (20) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart31.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part3#SP#subpart32.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 #------------------------------------------------------------------------
@@ -893,12 +893,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -924,16 +924,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -956,10 +956,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 1  */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#p0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -985,12 +985,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#part1sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#part2sp0.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -1732,12 +1732,12 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 CREATE TABLE t1 (
@@ -1766,16 +1766,16 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
 
 unified filelist
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD
-$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI
-$MYSQLTEST_VARDIR/master-data/test/t1.frm
-$MYSQLTEST_VARDIR/master-data/test/t1.par
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart11.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part1#SP#subpart12.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart21.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYD
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1#P#part2#SP#subpart22.MYI
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.frm
+$MYSQLTEST_VARDIR/mysqld.1/data/test/t1.par
 
 DROP TABLE t1;
 # 4.3.2 (positive) number of partition/subpartition ,
diff --git a/mysql-test/suite/parts/r/partition_t55.out b/mysql-test/suite/parts/r/partition_t55.out
index d86ceda8c38..e309785a30c 100644
--- a/mysql-test/suite/parts/r/partition_t55.out
+++ b/mysql-test/suite/parts/r/partition_t55.out
@@ -4,65 +4,65 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY HASH (abs(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
-27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYI
-36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYI
-36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYI
-27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYI
-18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYI
-45	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYI
-0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYI
-9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYD
-1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYI
-8594	MYSQL_TEST_DIR/var/master-data/test/t55.frm
-408	MYSQL_TEST_DIR/var/master-data/test/t55.par
+27	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp0.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp3.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p0#SP#p0sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp1.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp3.MYI
+36	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p1#SP#p1sp4.MYI
+36	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp0.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp3.MYI
+27	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p2#SP#p2sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp2.MYI
+18	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp3.MYI
+45	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p3#SP#p3sp4.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp0.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp1.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp2.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp3.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p4#SP#p4sp4.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp0.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp1.MYI
+0	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp2.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp3.MYI
+9	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYD
+1024	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55#P#p5#SP#p5sp4.MYI
+8594	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.frm
+408	MYSQL_TEST_DIR/var/mysqld.1/data/test/t55.par
diff --git a/mysql-test/suite/parts/t/partition_sessions.test b/mysql-test/suite/parts/t/partition_sessions.test
index ef3c5ef6a97..d9e3d6613aa 100644
--- a/mysql-test/suite/parts/t/partition_sessions.test
+++ b/mysql-test/suite/parts/t/partition_sessions.test
@@ -34,16 +34,16 @@ let $col_new_list    = new.f1,new.f2,new.f3 new.f4 ;
 --disable_query_log
 # DATA DIRECTORY
 # Make directory for partition data
---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpdata || true
+--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpdata || true
 eval SET @data_dir = 'DATA DIRECTORY =
-''$MYSQLTEST_VARDIR/master-data/tmpdata''';
+''$MYSQLTEST_VARDIR/mysqld.1/data/tmpdata''';
 let $data_directory = `select @data_dir`;
 
 #INDEX DIRECTORY
 # Make directory for partition index
---exec mkdir $MYSQLTEST_VARDIR/master-data/tmpindex || true
+--exec mkdir $MYSQLTEST_VARDIR/mysqld.1/data/tmpindex || true
 eval SET @indx_dir = 'INDEX DIRECTORY =
-''$MYSQLTEST_VARDIR/master-data/tmpindex''';
+''$MYSQLTEST_VARDIR/mysqld.1/data/tmpindex''';
 let $index_directory = `select @indx_dir`;
 --enable_query_log
author	unknown <msvensson@pilot.mysql.com>	2008-01-10 17:17:04 +0100
committer	unknown <msvensson@pilot.mysql.com>	2008-01-10 17:17:04 +0100
commit	0a69b0b833c451ff1357c3bf8bb3b01dbe398a8c (patch)
tree	71589b8c20166b30b1d850e851279ed814926a87 /mysql-test
parent	3435acd71eab5945fa2d659803db0ed356104659 (diff)
parent	c6a1ed022cc938f3a8d9590314db6904ad863321 (diff)
download	mariadb-git-0a69b0b833c451ff1357c3bf8bb3b01dbe398a8c.tar.gz