From 0193cbf91d938e972ad99cb75a34a8840725cae7 Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Sat, 3 Nov 2018 18:43:19 -0500
Subject: [PATCH] MCOL-520 - fix non-root supportReport issues

---
 oamapps/columnstoreSupport/columnstoreSupport.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index 05fe17445..ccf7714c4 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -58,6 +58,7 @@ string rootPassword = "";
 string debug_flag = "0";
 string mysqlpw = " ";
 string tmpDir;
+string ProfileFile;
 
 int runningThreads = 0;
 pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
@@ -130,9 +131,10 @@ void childReportThread(threadInfo_t& st)
 
     cout.flush();
 
-    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '" +
+    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '. " + ProfileFile + ";" +
                  installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir +
                  "' " + debug_flag + " - forcetty";
+
     int rtnCode = system(cmd.c_str());
 
     if (WEXITSTATUS(rtnCode) != 0)
@@ -669,6 +671,17 @@ int main(int argc, char* argv[])
         cout << "ERROR: Problem reading the Columnstore System Configuration file" << endl;
         exit(-1);
     }
+    
+    //Get Profile file 
+    try
+    {
+        ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
+    }
+    catch (...)
+    {
+        cout << "ERROR: Problem getting ProfileFile" << endl;
+        exit(-1);
+    }
 
     string ModuleSection = "SystemModuleConfig";