From 65f6701b998aabdba8fa405295da8b58a13fd2ce Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Thu, 16 Jan 2020 10:33:30 -0500
Subject: [PATCH] Moved the early-exit code in postConfig s.t. it will still
 run the mysql setup steps.

---
 oamapps/postConfigure/installer.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 8f072291b..9a2c73b1c 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -695,12 +695,6 @@ int main(int argc, char* argv[])
         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";
 
     {
@@ -717,6 +711,12 @@ int main(int argc, char* argv[])
             mysqlSetup();
             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
             int rtnCode = system(idbstartcmd.c_str());
 
@@ -738,6 +738,12 @@ int main(int argc, char* argv[])
             mysqlSetup();
             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
             cout << endl;
             cmd = "clearShm > /dev/null 2>&1";