summaryrefslogtreecommitdiff
path: root/mysys/my_symlink.c
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2008-10-27 19:25:11 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2008-10-27 19:25:11 +0400
commit979c11321c18105a6a87e31eda3c7ef4a6aeed68 (patch)
treeafe246c7fec796ca2a125a5292b3b5a27be73637 /mysys/my_symlink.c
parent10b525d0bc4c19291496b2235e78cb8e47d85827 (diff)
downloadmariadb-git-979c11321c18105a6a87e31eda3c7ef4a6aeed68.tar.gz
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
Diffstat (limited to 'mysys/my_symlink.c')
-rw-r--r--mysys/my_symlink.c17
1 files changed, 6 insertions, 11 deletions
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;