database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-26 15:05:27 -05:00
parent f25082bc9a
commit 07e78c410b
5 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
utils/startup/installdir.cpp
View File

@ -35,6 +35,9 @@ using namespace boost;
using namespace config;
#include <iostream>
using namespace std;
namespace startup
{
@ -97,36 +100,33 @@ const string StartUp::tmpDir()
#else
Config* sysConfig = Config::makeConfig();
//check for non-root user
const char* p = getenv("HOME");
string homedir = p;
string TempFileDir;
try
if (homedir == "/root")
{
TempFileDir = sysConfig->getConfig("SystemConfig", "TempFileDir");
Config* sysConfig = Config::makeConfig();
string TempFileDir;
try
{
TempFileDir = sysConfig->getConfig("SystemConfig", "TempFileDir");
}
catch (...)
{}
fTmpDirp = new string("/tmp");
*fTmpDirp = homedir + TempFileDir;
}
catch (...)
{}
fTmpDirp = new string("/tmp");
//See if we can figure out the tmp dir in Linux...
//1. env var COLUMNSTORE_INSTALL_DIR
const char* p = 0;
p = getenv("COLUMNSTORE_INSTALL_DIR");
if (p && *p)
{
string homedir = "/";
char* p = getenv("HOME");
if (p && *p)
homedir = p;
*fTmpDirp = homedir + "/.tmp";
else
{
// non-root user
*fTmpDirp = homedir + "/.tmp";
}
*fTmpDirp = *fTmpDirp + TempFileDir;
#endif
return *fTmpDirp;