#At file:///home/hf/work/mysql_common/39102/
2684 Alexey Botchkov 2008-10-27
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
modified:
mysql-test/t/partition_not_windows.test
mysys/my_symlink.c
=== modified file 'mysql-test/t/partition_not_windows.test'
--- a/mysql-test/t/partition_not_windows.test 2008-08-28 14:59:22 +0000
+++ b/mysql-test/t/partition_not_windows.test 2008-10-27 15:25:11 +0000
@@ -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.
=== modified file 'mysys/my_symlink.c'
--- a/mysys/my_symlink.c 2008-08-26 09:31:17 +0000
+++ b/mysys/my_symlink.c 2008-10-27 15:25:11 +0000
@@ -90,16 +90,6 @@ int my_symlink(const char *content, cons
#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 _
}
+/*
+ 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;
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (holyfoot:2684) Bug#39102 | Alexey Botchkov | 27 Oct |