database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable option

Browse Source 
support -DTMPDIR=/path in CMakeLists.txt

Patch by Honza Horak.
This commit is contained in:
Sergei Golubchik
2013-08-17 17:20:09 +04:00
parent 758b012ff2
commit c06eaf21b7
6 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -245,7 +245,9 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
IF(INSTALL_SYSCONFDIR) IF(INSTALL_SYSCONFDIR)
SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
ENDIF() ENDIF()
IF(TMPDIR)
SET(DEFAULT_TMPDIR "${TMPDIR}")
ENDIF()
# Run platform tests # Run platform tests
INCLUDE(configure.cmake) INCLUDE(configure.cmake)

1
config.h.cmake
View File

@ -619,6 +619,7 @@
#cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@" #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
#cmakedefine PLUGINDIR "@PLUGINDIR@" #cmakedefine PLUGINDIR "@PLUGINDIR@"
#cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@" #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@"
#cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"

7
include/my_global.h
View File

@ -1515,4 +1515,11 @@ static inline double rint(double x)
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
/*
Define default tmpdir if not already set.
*/
#if !defined(DEFAULT_TMPDIR)
#define DEFAULT_TMPDIR P_tmpdir
#endif
#endif /* my_global_h */ #endif /* my_global_h */

2
libmysqld/lib_sql.cc
View File

@ -559,7 +559,7 @@ int init_embedded_server(int argc, char **argv, char **groups)
opt_mysql_tmpdir=getenv("TMP"); opt_mysql_tmpdir=getenv("TMP");
#endif #endif
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */ opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR; /* purecov: inspected */
init_ssl(); init_ssl();
umask(((~my_umask) & 0666)); umask(((~my_umask) & 0666));

2
mysys/mf_tempdir.c
View File

@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
pathlist=getenv("TMP"); pathlist=getenv("TMP");
#endif #endif
if (!pathlist || !pathlist[0]) if (!pathlist || !pathlist[0])
pathlist=(char*) P_tmpdir; pathlist=(char*) DEFAULT_TMPDIR;
} }
do do
{ {

2
mysys/mf_tempfile.c
View File

@ -111,7 +111,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
sizeof(prefix_buff)-7),"XXXXXX") - sizeof(prefix_buff)-7),"XXXXXX") -
prefix_buff); prefix_buff);
if (!dir && ! (dir =getenv("TMPDIR"))) if (!dir && ! (dir =getenv("TMPDIR")))
dir=P_tmpdir; dir=DEFAULT_TMPDIR;
if (strlen(dir)+ pfx_len > FN_REFLEN-2) if (strlen(dir)+ pfx_len > FN_REFLEN-2)
{ {
errno=my_errno= ENAMETOOLONG; errno=my_errno= ENAMETOOLONG;