MySQL Lists: commits: bk commit into 5.1 tree (msvensson:1.2555)

List:	Commits	« Previous Message Next Message »
From:	msvensson	Date:	April 4 2008 3:46pm
Subject:	bk commit into 5.1 tree (msvensson:1.2555)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-04 17:46:48+02:00, msvensson@stripped +14 -0
  Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/inc/partition_check_drop.inc@stripped, 2008-04-04 17:46:44+02:00, msvensson@stripped +8 -4
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/inc/partition_layout.inc@stripped, 2008-04-04 17:46:44+02:00, msvensson@stripped +3 -2
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/inc/partition_layout_check1.inc@stripped, 2008-04-04 17:46:44+02:00, msvensson@stripped +13 -9
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/inc/partition_layout_check2.inc@stripped, 2008-04-04 17:46:44+02:00, msvensson@stripped +11 -6
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_alter1_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +992 -992
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_alter2_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +2232 -2232
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_alter3_innodb.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +52 -52
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_alter3_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +240 -240
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_basic_innodb.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +128 -128
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_basic_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +496 -496
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +1085 -1085
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_engine_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +88 -88
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/r/partition_syntax_myisam.result@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +80 -80
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

  mysql-test/suite/parts/t/partition_basic_symlink_innodb.test@stripped, 2008-04-04 17:46:45+02:00, msvensson@stripped +15 -12
    Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR

diff -Nrup a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc	2008-04-03 11:45:05 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc	2008-04-04 17:46:44 +02:00
@@ -21,15 +21,19 @@ if ($no_debug)
    --disable_query_log
 }
 
+# Get the MySQL Servers datadir without ending slash
+let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`;
+#echo MYSQLD_DATADIR: $MYSQLD_DATADIR;
+
 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 $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/tmp/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 || true
+--exec ls $MYSQLTEST_VARDIR/tmp/t1* >> $MYSQLD_DATADIR/test/tmp2 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -61,7 +65,7 @@ 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 $MYSQLD_DATADIR/test/t1* || true
    if ($with_directories)
    {
 	   --exec rm -f $MYSQLTEST_VARDIR/tmp/t1* || true
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc
--- a/mysql-test/suite/parts/inc/partition_layout.inc	2008-01-10 16:50:31 +01:00
+++ b/mysql-test/suite/parts/inc/partition_layout.inc	2008-04-04 17:46:44 +02:00
@@ -9,6 +9,7 @@ eval SHOW CREATE TABLE t1;
 # listing of files belonging to the table t1
 if ($ls)
 {
-   --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-   --exec ls $MYSQLTEST_VARDIR/mysqld.1/data/test/t1*
+   let $MYSQLD_DATADIR= `select @@datadir`;
+   --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+   --exec ls $MYSQLD_DATADIR/test/t1*
 }
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc	2008-04-03 11:45:12 +02:00
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc	2008-04-04 17:46:44 +02:00
@@ -25,23 +25,27 @@ if ($no_debug)
 # Clean the table holding the definition of t1
 DELETE FROM t0_definition;
 
+# Get the MySQL Servers datadir without ending slash
+let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`;
+#echo MYSQLD_DATADIR: $MYSQLD_DATADIR;
+
 # Dump the current definition of the table t1 to tmp1
 # This complicated method - let another mysqltest collect the output - is used
 # because of two reasons
 # - 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 > $MYSQLD_DATADIR/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 $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 2>&1 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2''
+eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2''
 )');
 let $file_list= `SELECT @aux`;
 }
@@ -52,7 +56,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('$MYSQLD_DATADIR/test/tmp1'),
      file_list      = $file_list;
 
 # Print the create table statement into the protocol
@@ -64,9 +68,9 @@ if ($do_file_tests)
    if ($ls)
    {
       # Print the list of files into the protocol
-      eval SELECT REPLACE(file_list,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR')
-                  AS "unified filelist"
-           FROM t0_definition WHERE state = 'old';
+      replace_result $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR;
+      SELECT file_list AS "unified filelist"
+       FROM t0_definition WHERE state = 'old';
    }
 }
 --enable_query_log
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc	2008-04-03 11:45:17 +02:00
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc	2008-04-04 17:46:44 +02:00
@@ -26,18 +26,23 @@ if ($no_debug)
 # Clean the table holding the definition of t1
 DELETE FROM t0_definition WHERE state = 'new';
 
+
+# Get the MySQL Servers datadir without ending slash
+let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`;
+#echo MYSQLD_DATADIR: $MYSQLD_DATADIR;
+
 # 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 > $MYSQLD_DATADIR/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 $MYSQLD_DATADIR/test/t1* > $MYSQLD_DATADIR/test/tmp2 2>&1 || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLD_DATADIR/test/tmp2 2>&1 || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
+eval SET @aux = CONCAT('load_file(''$MYSQLD_DATADIR','/test/tmp2'')');
 let $file_list= `SELECT @aux`;
 }
 if (!$do_file_tests)
@@ -47,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 = 'new',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
+     create_command = load_file('$MYSQLD_DATADIR/test/tmp1'),
      file_list      = $file_list;
 
 # Print the old and new table layout, if they differ
diff -Nrup a/mysql-test/suite/parts/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result
--- a/mysql-test/suite/parts/r/partition_alter1_myisam.result	2008-04-03 11:43:24 +02:00
+++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result	2008-04-04 17:46:45 +02:00
@@ -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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/test/t1.par
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
diff -Nrup a/mysql-test/suite/parts/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result
--- a/mysql-test/suite/parts/r/partition_alter2_myisam.result	2008-04-03 11:43:24 +02:00
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result	2008-04-04 17:46:45 +02:00
@@ -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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#part1sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#part2sp2.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp0.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp1.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#part3sp2.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#p0.MYD
+MYSQLD_DATADIR/test/t1#P#p0.MYI
+MYSQLD_DATADIR/test/t1#P#p1.MYD
+MYSQLD_DATADIR/test/t1#P#p1.MYI
+MYSQLD_DATADIR/test/t1#P#p2.MYD
+MYSQLD_DATADIR/test/t1#P#p2.MYI
+MYSQLD_DATADIR/test/t1#P#p3.MYD
+MYSQLD_DATADIR/test/t1#P#p3.MYI
+MYSQLD_DATADIR/test/t1#P#p4.MYD
+MYSQLD_DATADIR/test/t1#P#p4.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part0.MYD
+MYSQLD_DATADIR/test/t1#P#part0.MYI
+MYSQLD_DATADIR/test/t1#P#part1.MYD
+MYSQLD_DATADIR/test/t1#P#part1.MYI
+MYSQLD_DATADIR/test/t1#P#part2.MYD
+MYSQLD_DATADIR/test/t1#P#part2.MYI
+MYSQLD_DATADIR/test/t1#P#part3.MYD
+MYSQLD_DATADIR/test/t1#P#part3.MYI
+MYSQLD_DATADIR/test/t1#P#part_1.MYD
+MYSQLD_DATADIR/test/t1#P#part_1.MYI
+MYSQLD_DATADIR/test/t1#P#part_2.MYD
+MYSQLD_DATADIR/test/t1#P#part_2.MYI
+MYSQLD_DATADIR/test/t1#P#part_3.MYD
+MYSQLD_DATADIR/test/t1#P#part_3.MYI
+MYSQLD_DATADIR/test/t1#P#part_N.MYD
+MYSQLD_DATADIR/test/t1#P#part_N.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta.MYD
+MYSQLD_DATADIR/test/t1#P#parta.MYI
+MYSQLD_DATADIR/test/t1#P#partb.MYD
+MYSQLD_DATADIR/test/t1#P#partb.MYI
+MYSQLD_DATADIR/test/t1#P#partc.MYD
+MYSQLD_DATADIR/test/t1#P#partc.MYI
+MYSQLD_DATADIR/test/t1#P#partd.MYD
+MYSQLD_DATADIR/test/t1#P#partd.MYI
+MYSQLD_DATADIR/test/t1#P#parte.MYD
+MYSQLD_DATADIR/test/t1#P#parte.MYI
+MYSQLD_DATADIR/test/t1#P#partf.MYD
+MYSQLD_DATADIR/test/t1#P#partf.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp0.MYI
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYD
+MYSQLD_DATADIR/test/t1#P#parta#SP#partasp1.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partb#SP#partbsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partc#SP#partcsp1.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp0.MYI
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYD
+MYSQLD_DATADIR/test/t1#P#partd#SP#partdsp1.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#subpart12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#subpart22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#subpart32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#subpart42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp11.MYI
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYD
+MYSQLD_DATADIR/test/t1#P#part1#SP#sp12.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp21.MYI
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYD
+MYSQLD_DATADIR/test/t1#P#part2#SP#sp22.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp31.MYI
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYD
+MYSQLD_DATADIR/test/t1#P#part3#SP#sp32.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp41.MYI
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYD
+MYSQLD_DATADIR/test/t1#P#part4#SP#sp42.MYI
+MYSQLD_DATADIR/test/t1.frm
+MYSQLD_DATADIR/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/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