database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-21 13:40:58 +03:00
Code Activity

Moved the early-exit code in postConfig s.t. it will still run the

Browse Source 
mysql setup steps.
This commit is contained in:
Patrick LeBlanc
2020-01-16 10:33:30 -05:00
parent 2691dbf790
commit 65f6701b99
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
oamapps/postConfigure/installer.cpp
View File

@@ -695,12 +695,6 @@ int main(int argc, char* argv[])
system(cmd.c_str()); system(cmd.c_str());
} }
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
string idbstartcmd = "columnstore start"; string idbstartcmd = "columnstore start";
{ {
@@ -717,6 +711,12 @@ int main(int argc, char* argv[])
mysqlSetup(); mysqlSetup();
sleep(5); sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
//start on local module //start on local module
int rtnCode = system(idbstartcmd.c_str()); int rtnCode = system(idbstartcmd.c_str());
@@ -738,6 +738,12 @@ int main(int argc, char* argv[])
mysqlSetup(); mysqlSetup();
sleep(5); sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
exit(0);
}
//startup mysqld and infinidb processes //startup mysqld and infinidb processes
cout << endl; cout << endl;
cmd = "clearShm > /dev/null 2>&1"; cmd = "clearShm > /dev/null 2>&1";