Commit cd0817d4 authored by unknown's avatar unknown
Browse files

Fixes to make tests work in conjunction with other tests

parent e1f890e8

mysql-test/r/partition.result

+6 −0
Original line number Diff line number Diff line
@@ -1087,14 +1087,17 @@ partition by range (a) 
subpartition by hash (a)

(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart00, SUBPARTITION subpart01));

hello/master-data/test:

t1#P#p0#SP#subpart00.MYD

t1#P#p0#SP#subpart00.MYI

t1#P#p0#SP#subpart01.MYD

t1#P#p0#SP#subpart01.MYI

t1.frm

t1.par

hello/master-data/tmpdata:

t1#P#p0#SP#subpart00.MYD

t1#P#p0#SP#subpart01.MYD

hello/master-data/tmpinx:

t1#P#p0#SP#subpart00.MYI

t1#P#p0#SP#subpart01.MYI

ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
@@ -1102,6 +1105,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO 
(SUBPARTITION subpart10, SUBPARTITION subpart11),

partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart20, SUBPARTITION subpart21));

hello/master-data/test:

t1#P#p1#SP#subpart10.MYD

t1#P#p1#SP#subpart10.MYI

t1#P#p1#SP#subpart11.MYD
@@ -1112,10 +1116,12 @@ t1#P#p2#SP#subpart21.MYD 
t1#P#p2#SP#subpart21.MYI

t1.frm

t1.par

hello/master-data/tmpdata:

t1#P#p1#SP#subpart10.MYD

t1#P#p1#SP#subpart11.MYD

t1#P#p2#SP#subpart20.MYD

t1#P#p2#SP#subpart21.MYD

hello/master-data/tmpinx:

t1#P#p1#SP#subpart10.MYI

t1#P#p1#SP#subpart11.MYI

t1#P#p2#SP#subpart20.MYI

mysql-test/t/partition.test

+8 −6
Original line number Diff line number Diff line
@@ -1283,11 +1283,11 @@ subpartition by hash (a) 
 (SUBPARTITION subpart00, SUBPARTITION subpart01));



--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/test || true

--exec ls $MYSQLTEST_VARDIR/master-data/test t1* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata t1* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx t1* || true

--replace_result $MYSQLTEST_VARDIR "hello"



eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
@@ -1297,11 +1297,13 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO 
 (SUBPARTITION subpart20, SUBPARTITION subpart21));



--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/test || true

--exec ls $MYSQLTEST_VARDIR/master-data/test t1* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata t1* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx t1* || true



drop table t1;

--exec rmdir $MYSQLTEST_VARDIR/master-data/tmpdata || true

--exec rmdir $MYSQLTEST_VARDIR/master-data/tmpinx || true

--echo End of 5.1 tests