diff options
Diffstat (limited to 'mysql-test/t/partition_not_windows.test')
| -rw-r--r-- | mysql-test/t/partition_not_windows.test | 77 |
1 files changed, 42 insertions, 35 deletions
diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test index d7108d5af98..333e12e2b16 100644 --- a/mysql-test/t/partition_not_windows.test +++ b/mysql-test/t/partition_not_windows.test @@ -11,8 +11,8 @@ # Bug 20770 Partitions: DATA DIRECTORY clause change in reorganize # doesn't remove old directory +let $MYSQLD_DATADIR= `select @@datadir`; let $data_directory = DATA DIRECTORY = '$MYSQLTEST_VARDIR/tmp'; - let $inx_directory = INDEX DIRECTORY = '$MYSQLTEST_VARDIR/tmp'; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -23,12 +23,12 @@ subpartition by hash (a) (SUBPARTITION subpart00, SUBPARTITION subpart01)); --echo # Checking if file exists before alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYI --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart01.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYI @@ -42,16 +42,16 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO (SUBPARTITION subpart20, SUBPARTITION subpart21)); --echo # Checking if file exists after alter ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYD ---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYI +--file_exists $MYSQLD_DATADIR/test/t1.frm +--file_exists $MYSQLD_DATADIR/test/t1.par +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYI +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYD +--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYI --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart10.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart11.MYD --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart20.MYD @@ -93,39 +93,43 @@ set @@sql_mode=@org_mode; # # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY # ---replace_result $MYSQLTEST_VARDIR TEST_DIR + +let $MYSQLD_DATADIR= `select @@datadir`; + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) PARTITION BY KEY (a) -(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test'); ---replace_result $MYSQLTEST_VARDIR TEST_DIR +(PARTITION p0 DATA DIRECTORY '$MYSQLD_DATADIR/test'); + +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE t1(a INT) PARTITION BY KEY (a) -(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test'); +(PARTITION p0 INDEX DIRECTORY '$MYSQLD_DATADIR/test'); ---replace_result $MYSQLTEST_VARDIR TEST_DIR +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE ts (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a - DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test', + DATA DIRECTORY = '$MYSQLD_DATADIR/test', SUBPARTITION s0b - DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test' + DATA DIRECTORY = '$MYSQLD_DATADIR/test' )); ---replace_result $MYSQLTEST_VARDIR TEST_DIR +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --error ER_WRONG_ARGUMENTS eval CREATE TABLE ts (id INT, purchased DATE) PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) ( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0a - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test', + INDEX DIRECTORY = '$MYSQLD_DATADIR/test', SUBPARTITION s0b - INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test' + INDEX DIRECTORY = '$MYSQLD_DATADIR/test' )); # End Windows specific test failures. @@ -165,21 +169,24 @@ INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p2Index', PARTITION p3 DATA DIRECTORY = '$MYSQLTEST_VARDIR/p3Data' INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p3Index' ); + +let $MYSQLD_DATADIR= `select @@datadir`; + --echo # Checking that MyISAM .MYD and .MYI are in test db and data/idx dir ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYD --file_exists $MYSQLTEST_VARDIR/p0Data/example#P#p0.MYD --file_exists $MYSQLTEST_VARDIR/p0Index/example#P#p0.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYD --file_exists $MYSQLTEST_VARDIR/p1Data/example#P#p1.MYD --file_exists $MYSQLTEST_VARDIR/p1Index/example#P#p1.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYD --file_exists $MYSQLTEST_VARDIR/p2Data/example#P#p2.MYD --file_exists $MYSQLTEST_VARDIR/p2Index/example#P#p2.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYI ---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYD +--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYI +--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYD --file_exists $MYSQLTEST_VARDIR/p3Data/example#P#p3.MYD --file_exists $MYSQLTEST_VARDIR/p3Index/example#P#p3.MYI DROP TABLE example; |