From 6ca7e5c549bcd26a52097ba2a25647f86e898ffe Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@mysql.com>
Date: Mon, 27 Oct 2008 19:25:11 +0400
Subject: [PATCH] Bug#39102 valgrind build does not compile in realpath, which
 make DATA/INDEX DIR fail     #ifdef HAVE_purify removed

per-file comments:
  mysql-test/t/partition_not_windows.test
Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail
    test reenabled

  mysys/my_symlink.c
Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail
  superfluous ifdef removed, comments fixed
---
 mysql-test/t/partition_not_windows.test |  2 --
 mysys/my_symlink.c                      | 17 ++++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test
index 4814828c9b9..d7108d5af98 100644
--- a/mysql-test/t/partition_not_windows.test
+++ b/mysql-test/t/partition_not_windows.test
@@ -3,8 +3,6 @@
 --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.
diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c
index f8c6ebf02c3..258e227bb7b 100644
--- a/mysys/my_symlink.c
+++ b/mysys/my_symlink.c
@@ -90,16 +90,6 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
 #endif /* HAVE_READLINK */
 }
 
-/*
-  Resolve all symbolic links in path
-  'to' may be equal to 'filename'
-
-  Because purify gives a lot of UMR errors when using realpath(),
-  this code is disabled when using purify.
-
-  If MY_RESOLVE_LINK is given, only do realpath if the file is a link.
-*/
-
 #if defined(SCO)
 #define BUFF_LEN 4097
 #elif defined(MAXPATHLEN)
@@ -124,10 +114,15 @@ int my_is_symlink(const char *filename __attribute__((unused)))
 }
 
 
+/*
+  Resolve all symbolic links in path
+  'to' may be equal to 'filename'
+*/
+
 int my_realpath(char *to, const char *filename,
 		myf MyFlags __attribute__((unused)))
 {
-#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH)
+#if defined(HAVE_REALPATH) && !defined(HAVE_BROKEN_REALPATH)
   int result=0;
   char buff[BUFF_LEN];
   char *ptr;