From ea3ced83afd0a35d8dc2e06c53d0ccf588152092 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Mon, 27 Jan 2020 12:56:04 +0000 Subject: [PATCH] Merge pull request #1011 from pleblanc1976/minor-fixes Minor fixes --- oamapps/postConfigure/installer.cpp | 8 ++++++-- oamapps/postConfigure/postConfigure.cpp | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 9a2c73b1c..cb94d7c23 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -713,7 +713,9 @@ int main(int argc, char* argv[]) if (getenv("SKIP_OAM_INIT")) { - cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + cout << "(2) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + sysConfig->setConfig("Installation", "MySQLRep", "n"); + sysConfig->write(); exit(0); } @@ -740,7 +742,9 @@ int main(int argc, char* argv[]) if (getenv("SKIP_OAM_INIT")) { - cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + cout << "(3) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + sysConfig->setConfig("Installation", "MySQLRep", "n"); + sysConfig->write(); exit(0); } diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index b807876c3..1ec9b023e 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -3732,7 +3732,9 @@ int main(int argc, char* argv[]) if (getenv("SKIP_OAM_INIT")) { - cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + cout << "(1) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; + sysConfig->setConfig("Installation", "MySQLRep", "n"); + sysConfig->write(); exit(0); }