diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl old mode 100644 new mode 100755 diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc index 7123f05fc33..800448c6ab3 100644 --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc @@ -32,7 +32,7 @@ let $MYSQLD_DATADIR= `select LEFT(@@datadir, LENGTH(@@datadir)-1)`; #echo MYSQLD_DATADIR: $MYSQLD_DATADIR; # Dump the current definition of the table t1 to tmp1 -let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1; +let $show_file= $MYSQLD_DATADIR/test/tmp1; --exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true if ($do_file_tests) diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result index 7533b42340f..91e760c6d59 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result @@ -77,12 +77,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -592,18 +592,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -1121,24 +1121,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -1654,20 +1654,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -2179,24 +2179,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -2712,24 +2712,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -3245,24 +3245,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -3776,26 +3776,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -4306,12 +4306,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -4821,18 +4821,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -5350,24 +5350,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -5883,20 +5883,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -6408,24 +6408,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -6941,24 +6941,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -7474,24 +7474,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -8005,26 +8005,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 --git a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result index 69b8067d043..61d0e36643d 100644 --- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result @@ -236,12 +236,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 --git a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result index 23f32a715b4..978fab67a57 100644 --- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result @@ -74,12 +74,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -537,18 +537,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -1014,24 +1014,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -1495,20 +1495,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -1968,24 +1968,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1 DIV 2) SUBPARTITION BY HASH (f_int1) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -2451,24 +2451,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int1) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -2932,24 +2932,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int1 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -3411,26 +3411,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int1) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -4356,18 +4356,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -4833,24 +4833,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -5314,20 +5314,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -5787,24 +5787,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -6268,24 +6268,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -6749,24 +6749,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -7228,26 +7228,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -7706,12 +7706,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -8169,18 +8169,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -8646,24 +8646,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -9127,20 +9127,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -9600,24 +9600,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -10081,24 +10081,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -10562,24 +10562,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -11041,26 +11041,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -11519,12 +11519,12 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f_int1 + f_int2) PARTITIONS 2 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -11982,18 +11982,18 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (f_int1,f_int2) PARTITIONS 5 */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#p4.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -12459,24 +12459,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4)) (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM, PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM, PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM, PARTITION part_N VALUES IN (NULL) ENGINE = MyISAM, PARTITION part0 VALUES IN (0) ENGINE = MyISAM, PARTITION part1 VALUES IN (1) ENGINE = MyISAM, PARTITION part2 VALUES IN (2) ENGINE = MyISAM, PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_3.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part_N.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -12940,20 +12940,20 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2) (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM, PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parte.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partf.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -13413,24 +13413,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY HASH (f_int2) SUBPARTITIONS 2 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM, PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM, PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#parta#SP#partasp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partb#SP#partbsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partc#SP#partcsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#partd#SP#partdsp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -13894,24 +13894,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f_int1) SUBPARTITION BY KEY (f_int2) (PARTITION part1 VALUES LESS THAN (0) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (5) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (10) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM), PARTITION part4 VALUES LESS THAN (2147483646) (SUBPARTITION subpart41 ENGINE = MyISAM, SUBPARTITION subpart42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#subpart12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#subpart22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#subpart32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#subpart42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -14375,24 +14375,24 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3))) SUBPARTITION BY HASH (f_int2 + 1) (PARTITION part1 VALUES IN (0) (SUBPARTITION sp11 ENGINE = MyISAM, SUBPARTITION sp12 ENGINE = MyISAM), PARTITION part2 VALUES IN (1) (SUBPARTITION sp21 ENGINE = MyISAM, SUBPARTITION sp22 ENGINE = MyISAM), PARTITION part3 VALUES IN (2) (SUBPARTITION sp31 ENGINE = MyISAM, SUBPARTITION sp32 ENGINE = MyISAM), PARTITION part4 VALUES IN (NULL) (SUBPARTITION sp41 ENGINE = MyISAM, SUBPARTITION sp42 ENGINE = MyISAM)) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp11.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#sp12.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp21.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#sp22.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp31.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#sp32.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp41.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part4#SP#sp42.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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 @@ -14854,26 +14854,26 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2))) SUBPARTITION BY KEY (f_int2) SUBPARTITIONS 3 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM, PARTITION part2 VALUES IN (1) ENGINE = MyISAM, PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */ unified filelist -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part1#SP#part1sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part2#SP#part2sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp0.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp1.MYI -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYD -$MYSQLTEST_VARDIR/master-data/test/t1#P#part3#SP#part3sp2.MYI -$MYSQLTEST_VARDIR/master-data/test/t1.frm -$MYSQLTEST_VARDIR/master-data/test/t1.par +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