database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-05 15:41:14 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
parent 6c4afdf18b 0dd33c6f75
commit 020b211bb7
83 changed files with 469 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
exemgr/main.cpp
View File

@ -1301,10 +1301,12 @@ void setupSignalHandlers()
void setupCwd(joblist::ResourceManager* rm)
{
std::string workdir = rm->getScWorkingDir();
(void)chdir(workdir.c_str());
int8_t rc = chdir(workdir.c_str());
if (access(".", W_OK) != 0)
(void)chdir("/tmp");
if (rc < 0 || access(".", W_OK) != 0)
rc = chdir("/tmp");
return (rc < 0) ? -5 : rc;
}
void startRssMon(size_t maxPct, int pauseSeconds)
@ -1470,9 +1472,12 @@ int main(int argc, char* argv[])
break;
default:
errMsg = "Couldn't change working directory or unknown error";
break;
}
err = setupCwd(rm);
if (err < 0)
{
oam::Oam oam;
@ -1496,9 +1501,6 @@ int main(int argc, char* argv[])
return 2;
}
setupCwd(rm);
cleanTempDir();
logging::MsgMap msgMap;