database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixes to make tests work in conjunction with other tests

Browse Source
This commit is contained in:
mikael/pappa@dator5.(none)
2006-07-15 07:28:31 -04:00
parent 30989a77a7
commit cc545cc6cf
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/partition.result
View File

@@ -1087,14 +1087,17 @@ partition by range (a)
subpartition by hash (a) subpartition by hash (a)
(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx' (partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'
(SUBPARTITION subpart00, SUBPARTITION subpart01)); (SUBPARTITION subpart00, SUBPARTITION subpart01));
hello/master-data/test:
t1#P#p0#SP#subpart00.MYD t1#P#p0#SP#subpart00.MYD
t1#P#p0#SP#subpart00.MYI t1#P#p0#SP#subpart00.MYI
t1#P#p0#SP#subpart01.MYD t1#P#p0#SP#subpart01.MYD
t1#P#p0#SP#subpart01.MYI t1#P#p0#SP#subpart01.MYI
t1.frm t1.frm
t1.par t1.par
hello/master-data/tmpdata:
t1#P#p0#SP#subpart00.MYD t1#P#p0#SP#subpart00.MYD
t1#P#p0#SP#subpart01.MYD t1#P#p0#SP#subpart01.MYD
hello/master-data/tmpinx:
t1#P#p0#SP#subpart00.MYI t1#P#p0#SP#subpart00.MYI
t1#P#p0#SP#subpart01.MYI t1#P#p0#SP#subpart01.MYI
ALTER TABLE t1 REORGANIZE PARTITION p0 INTO ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
@@ -1102,6 +1105,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
(SUBPARTITION subpart10, SUBPARTITION subpart11), (SUBPARTITION subpart10, SUBPARTITION subpart11),
partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx' partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'
(SUBPARTITION subpart20, SUBPARTITION subpart21)); (SUBPARTITION subpart20, SUBPARTITION subpart21));
hello/master-data/test:
t1#P#p1#SP#subpart10.MYD t1#P#p1#SP#subpart10.MYD
t1#P#p1#SP#subpart10.MYI t1#P#p1#SP#subpart10.MYI
t1#P#p1#SP#subpart11.MYD t1#P#p1#SP#subpart11.MYD
@@ -1112,10 +1116,12 @@ t1#P#p2#SP#subpart21.MYD
t1#P#p2#SP#subpart21.MYI t1#P#p2#SP#subpart21.MYI
t1.frm t1.frm
t1.par t1.par
hello/master-data/tmpdata:
t1#P#p1#SP#subpart10.MYD t1#P#p1#SP#subpart10.MYD
t1#P#p1#SP#subpart11.MYD t1#P#p1#SP#subpart11.MYD
t1#P#p2#SP#subpart20.MYD t1#P#p2#SP#subpart20.MYD
t1#P#p2#SP#subpart21.MYD t1#P#p2#SP#subpart21.MYD
hello/master-data/tmpinx:
t1#P#p1#SP#subpart10.MYI t1#P#p1#SP#subpart10.MYI
t1#P#p1#SP#subpart11.MYI t1#P#p1#SP#subpart11.MYI
t1#P#p2#SP#subpart20.MYI t1#P#p2#SP#subpart20.MYI

14
mysql-test/t/partition.test
View File

@@ -1283,11 +1283,11 @@ subpartition by hash (a)
(SUBPARTITION subpart00, SUBPARTITION subpart01)); (SUBPARTITION subpart00, SUBPARTITION subpart01));
--replace_result $MYSQLTEST_VARDIR "hello" --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" --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" --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" --replace_result $MYSQLTEST_VARDIR "hello"
eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
@@ -1297,11 +1297,13 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
(SUBPARTITION subpart20, SUBPARTITION subpart21)); (SUBPARTITION subpart20, SUBPARTITION subpart21));
--replace_result $MYSQLTEST_VARDIR "hello" --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" --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" --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; 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 --echo End of 5.1 tests