summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-08-17 17:20:09 +0400
committerSergei Golubchik <sergii@pisem.net>2013-08-17 17:20:09 +0400
commitc06eaf21b78093524e1a39c55415d4eab3d2cd78 (patch)
tree0b0e1ed3d8c1e877f2e66651cf999b5af5e64975 /mysys
parent758b012ff23597faa099a2f9562a54f1bae2cca6 (diff)
downloadmariadb-git-c06eaf21b78093524e1a39c55415d4eab3d2cd78.tar.gz
MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable option
support -DTMPDIR=/path in CMakeLists.txt Patch by Honza Horak.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_tempdir.c2
-rw-r--r--mysys/mf_tempfile.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index eceb90bb619..e6b56f7d1d0 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
pathlist=getenv("TMP");
#endif
if (!pathlist || !pathlist[0])
- pathlist=(char*) P_tmpdir;
+ pathlist=(char*) DEFAULT_TMPDIR;
}
do
{
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 15482075c39..5ff139bc92a 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -111,7 +111,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
sizeof(prefix_buff)-7),"XXXXXX") -
prefix_buff);
if (!dir && ! (dir =getenv("TMPDIR")))
- dir=P_tmpdir;
+ dir=DEFAULT_TMPDIR;
if (strlen(dir)+ pfx_len > FN_REFLEN-2)
{
errno=my_errno= ENAMETOOLONG;