database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail

Browse Source 
#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
This commit is contained in:
Alexey Botchkov
2008-10-27 19:25:11 +04:00
parent 8d108cb53b
commit 6ca7e5c549
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/partition_not_windows.test
View File

@ -3,8 +3,6 @@
--source include/have_partition.inc --source include/have_partition.inc
# DATA DIRECTORY/INDEX DIRECTORY require symbolic link support # DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
--source include/have_symlink.inc --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 # 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. # should be moved into partition.test once the bug has been resolved.

17
mysys/my_symlink.c
View File

@ -90,16 +90,6 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
#endif /* HAVE_READLINK */ #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) #if defined(SCO)
#define BUFF_LEN 4097 #define BUFF_LEN 4097
#elif defined(MAXPATHLEN) #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, int my_realpath(char *to, const char *filename,
myf MyFlags __attribute__((unused))) 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; int result=0;
char buff[BUFF_LEN]; char buff[BUFF_LEN];
char *ptr; char *ptr;