summaryrefslogtreecommitdiff
path: root/mysql-test/suite/parts/inc/partition_smallint.inc
diff options
context:
space:
mode:
authorunknown <mattiasj@witty.>2008-02-06 15:13:56 +0100
committerunknown <mattiasj@witty.>2008-02-06 15:13:56 +0100
commit2bac240cf78642d7c5ee428f544286ad8f526df5 (patch)
tree2daa2b4775537bfa3eccbb720fba2d0348f3927f /mysql-test/suite/parts/inc/partition_smallint.inc
parent629b355b4a2bc051e538244410edc1e3d0933a65 (diff)
downloadmariadb-git-2bac240cf78642d7c5ee428f544286ad8f526df5.tar.gz
Bug#34225: test suit parts uses /tmp-dir
Since it used /tmp-dir, it continues to fail on the same server until the /tmp-dir is cleaned. (Another problem was that it uses DATA/INDEX DIR without checking for symlink, which is needed) Solution: Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file and use this for myisam and innodb, also requiring symlinks and not_windows. (i.e. removed DATA/INDEX DIR use from several tests) mysql-test/suite/parts/inc/partition_basic.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_bigint.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_binary.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_bit.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_blob.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_char.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_date.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_datetime.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_decimal.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_double.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_enum.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_float.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_int.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_key_16col.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_key_32col.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_key_4col.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_key_8col.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_mediumint.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_set.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_smallint.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_text.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_time.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_timestamp.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_tinyint.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_varbinary.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_varchar.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_year.inc: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_basic_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_basic_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_bit_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_bit_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_char_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_char_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_datetime_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_datetime_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_decimal_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_decimal_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_float_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_float_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_int_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_int_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_special_innodb.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/r/partition_special_myisam.result: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/t/partition_sessions.test: Bug#34225: test suit parts uses /tmp-dir Removed the DATA/INDEX DIR, since the test is not dependent of it (adding "--source include/have_symlink.inc" would have disabled it on some platforms/configurations) mysql-test/suite/parts/inc/partition_basic_symlink.inc: Bug#34225: test suit parts uses /tmp-dir Added this test case for testing some DATA/INDEX DIRECTORY cases since I removed so much of it from all other tests. mysql-test/suite/parts/r/partition_basic_symlink_innodb.result: Bug#34225: test suit parts uses /tmp-dir Added this test case for testing some DATA/INDEX DIRECTORY cases since I removed so much of it from all other tests. mysql-test/suite/parts/r/partition_basic_symlink_myisam.result: Bug#34225: test suit parts uses /tmp-dir Added this test case for testing some DATA/INDEX DIRECTORY cases since I removed so much of it from all other tests. mysql-test/suite/parts/t/partition_basic_symlink_innodb.test: Bug#34225: test suit parts uses /tmp-dir Added this test case for testing some DATA/INDEX DIRECTORY cases since I removed so much of it from all other tests. mysql-test/suite/parts/t/partition_basic_symlink_myisam.test: Bug#34225: test suit parts uses /tmp-dir Added this test case for testing some DATA/INDEX DIRECTORY cases since I removed so much of it from all other tests.
Diffstat (limited to 'mysql-test/suite/parts/inc/partition_smallint.inc')
-rw-r--r--mysql-test/suite/parts/inc/partition_smallint.inc20
1 files changed, 4 insertions, 16 deletions
diff --git a/mysql-test/suite/parts/inc/partition_smallint.inc b/mysql-test/suite/parts/inc/partition_smallint.inc
index c594cd4c26c..8e5e93f079b 100644
--- a/mysql-test/suite/parts/inc/partition_smallint.inc
+++ b/mysql-test/suite/parts/inc/partition_smallint.inc
@@ -1,21 +1,9 @@
---disable_query_log
-# DATA DIRECTORY
-eval SET @data_dir = 'DATA DIRECTORY =
-''/tmp''';
-let $data_directory = `select @data_dir`;
-
-#INDEX DIRECTORY
-eval SET @indx_dir = 'INDEX DIRECTORY =
-''/tmp''';
-let $index_directory = `select @indx_dir`;
---enable_query_log
-
eval create table t1 (a smallint unsigned not null, primary key(a)) engine=$engine
partition by key (a) (
-partition pa1 $data_directory $index_directory max_rows=20 min_rows=2,
-partition pa2 $data_directory $index_directory max_rows=30 min_rows=3,
-partition pa3 $data_directory $index_directory max_rows=30 min_rows=4,
-partition pa4 $data_directory $index_directory max_rows=40 min_rows=2);
+partition pa1 max_rows=20 min_rows=2,
+partition pa2 max_rows=30 min_rows=3,
+partition pa3 max_rows=30 min_rows=4,
+partition pa4 max_rows=40 min_rows=2);
show create table t1;
insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256);
select * from t1;