summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <tsmith@quadxeon.mysql.com>2007-04-25 20:21:55 +0200
committerunknown <tsmith@quadxeon.mysql.com>2007-04-25 20:21:55 +0200
commit47c0b4ca629f9f9315fa3821dfb4d8dbfe718449 (patch)
tree20b2ba3c616f107c95457bbf123d2d10bbc90a58 /mysql-test/t
parent604c12b4660c038503a3a970f1ef986027065a88 (diff)
downloadmariadb-git-47c0b4ca629f9f9315fa3821dfb4d8dbfe718449.tar.gz
Fix for valgrind errors in test: require symlink support for partition_not_windows.test
mysql-test/include/have_symlink.inc: BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/partition_mgm_err2.test11
-rw-r--r--mysql-test/t/partition_not_windows.test2
-rw-r--r--mysql-test/t/symlink.test6
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