Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

mysql-test/include/have_symlink.inc

@@ -0,0 +1,10 @@
+# Several partition-related tests include this file, because Valgrind/Purify
+# builds disable symlink support; some partition functionality depends on
+# symlink support, and so does not test correctly under valgrind.  See the
+# comment in mysqld.cc for the --symbolic-links option.
+
+-- require r/have_symlink.require
+
+disable_query_log;
+show variables like "have_symlink";
+enable_query_log;

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
 #

mysql-test/t/partition_not_windows-master.opt

@@ -0,0 +1 @@
+--symbolic-links=1

mysql-test/t/partition_not_windows.test

@@ -1,11 +1,11 @@
 # Non-windows specific partition tests.
 --source include/not_windows.inc
 --source include/have_partition.inc
+# DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
+--source include/have_symlink.inc
 
-# partition.test used to contained the following note:
-# This test is disabled on Windows due to BUG#19107
-# All tests passed on Windows except the following which should be moved into
-# partition.test once the bug has been resolved.
+# The test for Bug 20770 is disabled on Windows due to BUG#19107; it
+# should be moved into partition.test once the bug has been resolved.
 
 #
 # Bug 20770 Partitions: DATA DIRECTORY clause change in reorganize

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