bzr push into mysql-6.0 branch (mattiasj:2812 to 2813)

[Mattias Jonsson]

 2813 Mattias Jonsson	2008-08-28 [merge]
      merge
modified:
  mysql-test/t/partition_not_windows.test

 2812 Matthias Leich	2008-08-28 [merge]
      Upmerge 5.1-bugteam -> 6.0-bugteam
      No changes/conflicts because everything
      is already in 6.0-bugteam.

=== modified file 'mysql-test/t/partition_not_windows.test'
--- a/mysql-test/t/partition_not_windows.test	2008-03-17 15:11:26 +0000
+++ b/mysql-test/t/partition_not_windows.test	2008-08-28 14:59:22 +0000
@@ -3,6 +3,8 @@
 --source include/have_partition.inc
 # DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
 --source include/have_symlink.inc
+# realpath is not compiled in when building with valgrind
+--source include/not_valgrind.inc
 
 # 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.