From: Date: August 28 2008 5:05pm
Subject: bzr push into mysql-5.1 branch (mattiasj:2722 to 2723) Bug#32167
List-Archive: http://lists.mysql.com/commits/52857
X-Bug: 32167
Message-Id: <20080828150523.4F98CFE5F41@witty.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2723 Mattias Jonsson	2008-08-28
      Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
      
      post push patch
      when building with valgrind, it does not compile in realpath,
      so this test fails when using a valgrind build
      NOTE: building with valgrind is not the same as useing the
      --valgrind option with mysql-test-run
modified:
  mysql-test/t/partition_not_windows.test

 2722 Matthias Leich	2008-08-28 [merge]
      Upmerge 5.0-bugteam - 5.1-bugteam
      No conflicts/changes because 5.1-bugteam
      contains already everything.

=== 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.