Attachment 696099 Details for Bug 905635 – Make tmpdir a configurable option

[patch] Make tmpdir a configurable option

mysql-tmpdir.patch (text/plain), 3.01 KB, created by Honza Horak on 2013-02-11 14:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2013-02-11 14:10:27 UTC

Size: 3.01 KB

patch

obsolete

>diff -up mysql-5.5.29/CMakeLists.txt.tmpdir mysql-5.5.29/CMakeLists.txt
>--- mysql-5.5.29/CMakeLists.txt.tmpdir	2012-12-10 07:16:24.000000000 +0100
>+++ mysql-5.5.29/CMakeLists.txt	2013-02-07 14:16:49.891906389 +0100
>@@ -252,7 +252,9 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${I
> IF(SYSCONFDIR)
>   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
> ENDIF()
>-
>+IF(TMPDIR)
>+  SET(DEFAULT_TMPDIR "${TMPDIR}")
>+ENDIF()
> 
> # Run platform tests
> INCLUDE(configure.cmake)
>diff -up mysql-5.5.29/config.h.cmake.tmpdir mysql-5.5.29/config.h.cmake
>--- mysql-5.5.29/config.h.cmake.tmpdir	2012-12-10 07:16:24.000000000 +0100
>+++ mysql-5.5.29/config.h.cmake	2013-02-07 14:16:49.891906389 +0100
>@@ -600,6 +600,7 @@
> #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
> #cmakedefine PLUGINDIR "@PLUGINDIR@"
> #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
>+#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@"
> 
> #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
> 
>diff -up mysql-5.5.29/include/my_global.h.tmpdir mysql-5.5.29/include/my_global.h
>--- mysql-5.5.29/include/my_global.h.tmpdir	2013-02-11 12:30:09.214779973 +0100
>+++ mysql-5.5.29/include/my_global.h	2013-02-11 12:30:45.265777508 +0100
>@@ -1501,4 +1501,11 @@ static inline double rint(double x)
> 
> #endif /* EMBEDDED_LIBRARY */
> 
>+/*
>+  Define default tmpdir if not already set.
>+*/
>+#if !defined(DEFAULT_TMPDIR)
>+#define DEFAULT_TMPDIR P_tmpdir
>+#endif
>+
> #endif /* my_global_h */
>diff -up mysql-5.5.29/libmysqld/lib_sql.cc.tmpdir mysql-5.5.29/libmysqld/lib_sql.cc
>--- mysql-5.5.29/libmysqld/lib_sql.cc.tmpdir	2012-12-10 07:16:24.000000000 +0100
>+++ mysql-5.5.29/libmysqld/lib_sql.cc	2013-02-11 12:23:54.369805605 +0100
>@@ -558,7 +558,7 @@ int init_embedded_server(int argc, char
>     opt_mysql_tmpdir=getenv("TMP");
> #endif
>   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();
>   umask(((~my_umask) & 0666));
>diff -up mysql-5.5.29/mysys/mf_tempdir.c.tmpdir mysql-5.5.29/mysys/mf_tempdir.c
>--- mysql-5.5.29/mysys/mf_tempdir.c.tmpdir	2012-12-10 07:16:24.000000000 +0100
>+++ mysql-5.5.29/mysys/mf_tempdir.c	2013-02-07 14:16:49.892906389 +0100
>@@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, c
>       pathlist=getenv("TMP");
> #endif
>     if (!pathlist || !pathlist[0])
>-      pathlist=(char*) P_tmpdir;
>+      pathlist=(char*) DEFAULT_TMPDIR;
>   }
>   do
>   {
>diff -up mysql-5.5.29/mysys/mf_tempfile.c.tmpdir mysql-5.5.29/mysys/mf_tempfile.c
>--- mysql-5.5.29/mysys/mf_tempfile.c.tmpdir	2012-12-10 07:16:24.000000000 +0100
>+++ mysql-5.5.29/mysys/mf_tempfile.c	2013-02-07 14:16:49.893906389 +0100
>@@ -111,7 +111,7 @@ File create_temp_file(char *to, const ch
> 				    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;
>diff -up mysql-5.5.29/mysys/mysys_priv.h.tmpdir mysql-5.5.29/mysys/mysys_priv.h

Actions: View | Diff

Attachments on bug 905635: 696099