diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/partition_mgm_err2.test | 11 | ||||
| -rw-r--r-- | mysql-test/t/partition_not_windows.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/mysql-test/t/partition_mgm_err2.test b/mysql-test/t/partition_mgm_err2.test index 925178a720d..f683ec6277e 100644 --- a/mysql-test/t/partition_mgm_err2.test +++ b/mysql-test/t/partition_mgm_err2.test @@ -1,18 +1,13 @@ # # Test of partitions that require symlinks # --- source include/have_partition.inc +--source include/have_partition.inc +--source include/have_symlink.inc # # This test is disabled on windows due to BUG#19107 # --- source include/not_windows.inc --- require r/have_symlink.require - -disable_query_log; -show variables like "have_symlink"; -enable_query_log; - +--source include/not_windows.inc # # BUG: 14354 Partitions: data directory clause fails # diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test index 27f76eb4279..22bede08d54 100644 --- a/mysql-test/t/partition_not_windows.test +++ b/mysql-test/t/partition_not_windows.test @@ -1,6 +1,8 @@ # Non-windows specific partition tests. --source include/not_windows.inc --source include/have_partition.inc +# SUBPARTITION depends on symlink support +--source include/have_symlink.inc # partition.test used to contained the following note: # This test is disabled on Windows due to BUG#19107 diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index d79b6905224..981206ca54c 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -1,8 +1,4 @@ --- require r/have_symlink.require -disable_query_log; -show variables like "have_symlink"; -enable_query_log; - +--source include/have_symlink.inc --source include/not_windows.inc --disable_warnings |