1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove HAVE_BROKEN_REALPATH

Browse Source 
Was only applicable to FreeBSD < ~5.1.9
per: 33173fbe827ed435066a3253a87866a0994503e4
This commit is contained in:
Daniel Black 2024-09-24 09:56:08 +10:00
parent 3a4bc9aa35
commit e927e28ebe
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/os/FreeBSD.cmake
View File

@ -20,9 +20,6 @@
# #Legacy option, maybe not needed anymore , taken as is from autotools build # #Legacy option, maybe not needed anymore , taken as is from autotools build
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
# The below was used for really old versions of FreeBSD, roughly: before 5.1.9
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
# Find libexecinfo (library that contains backtrace_symbols etc) # Find libexecinfo (library that contains backtrace_symbols etc)
SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header") SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include) INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)

2
mysys/my_symlink.c
View File

@ -141,7 +141,7 @@ int my_is_symlink(const char *filename __attribute__((unused)))
int my_realpath(char *to, const char *filename, myf MyFlags) int my_realpath(char *to, const char *filename, myf MyFlags)
{ {
#if defined(HAVE_REALPATH) && !defined(HAVE_BROKEN_REALPATH) #if defined(HAVE_REALPATH)
int result=0; int result=0;
char buff[BUFF_LEN]; char buff[BUFF_LEN];
char *ptr; char *ptr;

11
sql/mysqld.cc
View File

@ -7781,7 +7781,7 @@ static int mysql_init_variables(void)
/* Things reset to zero */ /* Things reset to zero */
opt_skip_slave_start= opt_reckless_slave = 0; opt_skip_slave_start= opt_reckless_slave = 0;
mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0; mysql_home[0]= pidfile_name[0]= log_error_file[0]= 0;
#if defined(HAVE_REALPATH) && !defined(HAVE_valgrind) && !defined(HAVE_BROKEN_REALPATH) #if defined(HAVE_REALPATH) && !defined(HAVE_valgrind)
/* We can only test for sub paths if my_symlink.c is using realpath */ /* We can only test for sub paths if my_symlink.c is using realpath */
mysys_test_invalid_symlink= path_starts_from_data_home_dir; mysys_test_invalid_symlink= path_starts_from_data_home_dir;
#endif #endif
@ -7882,6 +7882,8 @@ static int mysql_init_variables(void)
lc_messages= (char*) "en_US"; lc_messages= (char*) "en_US";
lc_time_names_name= (char*) "en_US"; lc_time_names_name= (char*) "en_US";
have_symlink= SHOW_OPTION_YES;
/* Variables that depends on compile options */ /* Variables that depends on compile options */
#ifndef DBUG_OFF #ifndef DBUG_OFF
default_dbug_option=IF_WIN("d:t:i:O,\\mariadbd.trace", default_dbug_option=IF_WIN("d:t:i:O,\\mariadbd.trace",
@ -7905,11 +7907,6 @@ static int mysql_init_variables(void)
#else #else
have_openssl= have_ssl= SHOW_OPTION_NO; have_openssl= have_ssl= SHOW_OPTION_NO;
#endif #endif
#ifdef HAVE_BROKEN_REALPATH
have_symlink=SHOW_OPTION_NO;
#else
have_symlink=SHOW_OPTION_YES;
#endif
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
have_dlopen=SHOW_OPTION_YES; have_dlopen=SHOW_OPTION_YES;
#else #else
@ -8669,7 +8666,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
global_system_variables.sql_mode= global_system_variables.sql_mode=
expand_sql_mode(global_system_variables.sql_mode); expand_sql_mode(global_system_variables.sql_mode);
#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH) #if !defined(HAVE_REALPATH)
my_use_symdir=0; my_use_symdir=0;
my_disable_symlinks=1; my_disable_symlinks=1;
have_symlink=SHOW_OPTION_NO; have_symlink=SHOW_OPTION_NO;