[Commits] Rev 3852: Merge in file:///home/igor/maria/maria-5.5-merge/

Igor Babaev igor at askmonty.org
Mon Aug 19 08:13:50 EEST 2013


At file:///home/igor/maria/maria-5.5-merge/

------------------------------------------------------------
revno: 3852 [merge]
revision-id: igor at askmonty.org-20130819051349-n9ypd8xkk61q7fm9
parent: igor at askmonty.org-20130819025851-nqmvm64qezc2077w
parent: sergii at pisem.net-20130817132009-13buuzsz5vqfx751
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.5-merge
timestamp: Sun 2013-08-18 22:13:49 -0700
message:
  Merge
modified:
  CMakeLists.txt                 sp1f-cmakelists.txt-20060831175236-433hkm7nrqfjbwios4ancgytabw354nr
  config.h.cmake                 config.h.cmake-20091108233336-m9ewbh1c209yaw0h-3
  include/my_global.h            sp1f-my_global.h-20010915021246-4vawdgfw4vg3tuxq6mejt7lrchcnceha
  libmysqld/lib_sql.cc           sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
  mysys/mf_tempdir.c             sp1f-mf_tempdir.c-20021008123916-arbrytgvpsafkpvufxucim72275qsor5
  mysys/mf_tempfile.c            sp1f-mf_tempfile.c-20001003094625-7u4mnak2fmc4rwvkxcqp5r44j4ebiwqo
  mysys/my_getsystime.c          sp1f-my_getsystime.c-20040302212107-h5blakn74xewolernjfpc23tn623kllm
-------------- next part --------------
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2013-07-16 17:09:54 +0000
+++ b/CMakeLists.txt	2013-08-17 13:20:09 +0000
@@ -245,7 +245,9 @@
 IF(INSTALL_SYSCONFDIR)
   SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
-
+IF(TMPDIR)
+  SET(DEFAULT_TMPDIR "${TMPDIR}")
+ENDIF()
 
 # Run platform tests
 INCLUDE(configure.cmake)

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2013-06-15 12:22:03 +0000
+++ b/config.h.cmake	2013-08-17 13:20:09 +0000
@@ -619,6 +619,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@"
 

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2013-07-16 17:09:54 +0000
+++ b/include/my_global.h	2013-08-17 13:20:09 +0000
@@ -1515,4 +1515,11 @@
 
 #endif /* EMBEDDED_LIBRARY */
 
+/*
+  Define default tmpdir if not already set.
+*/
+#if !defined(DEFAULT_TMPDIR)
+#define DEFAULT_TMPDIR P_tmpdir
+#endif
+
 #endif /* my_global_h */

=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2013-04-17 17:42:34 +0000
+++ b/libmysqld/lib_sql.cc	2013-08-17 13:20:09 +0000
@@ -559,7 +559,7 @@
     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));

=== modified file 'mysys/mf_tempdir.c'
--- a/mysys/mf_tempdir.c	2011-06-30 15:46:53 +0000
+++ b/mysys/mf_tempdir.c	2013-08-17 13:20:09 +0000
@@ -43,7 +43,7 @@
       pathlist=getenv("TMP");
 #endif
     if (!pathlist || !pathlist[0])
-      pathlist=(char*) P_tmpdir;
+      pathlist=(char*) DEFAULT_TMPDIR;
   }
   do
   {

=== modified file 'mysys/mf_tempfile.c'
--- a/mysys/mf_tempfile.c	2013-07-16 17:09:54 +0000
+++ b/mysys/mf_tempfile.c	2013-08-17 13:20:09 +0000
@@ -111,7 +111,7 @@
 				    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;

=== modified file 'mysys/my_getsystime.c'
--- a/mysys/my_getsystime.c	2013-07-16 17:09:54 +0000
+++ b/mysys/my_getsystime.c	2013-08-14 09:12:57 +0000
@@ -113,7 +113,7 @@
 
 
 /*
-  Return cpu time in milliseconds * 10
+  Return cpu time in 1/10th on a microsecond (1e-7 s)
 */
 
 ulonglong my_getcputime()



More information about the commits mailing list