From 9be721056813658ead903aacc5382878be8dd817 Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Wed, 7 Nov 2018 20:33:12 -0600
Subject: [PATCH 1/2] MCOL-520 remove debug bash -x

---
 build/columnstore_startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/columnstore_startup.sh b/build/columnstore_startup.sh
index 98c23d1f9..76d2f3b48 100755
--- a/build/columnstore_startup.sh
+++ b/build/columnstore_startup.sh
@@ -21,7 +21,7 @@ for arg in "$@"; do
 	fi
 done
 
-bash -x $installdir/bin/post-install --installdir=/usr/local/mariadb/columnstore
+$installdir/bin/post-install --installdir=/usr/local/mariadb/columnstore
 echo -e "1\n1\n1\n1\n1\n1\n" | $installdir/bin/postConfigure -i $installdir
 if [ $? -eq 0 ]; then
 	exit 0

From f830955be946fabb8558fa6a4ecbd94c9751348c Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Thu, 8 Nov 2018 11:25:59 -0600
Subject: [PATCH 2/2] Rescoped the tmpdir var, global -> class, in liboamcpp to
 fix a race.

---
 oam/oamcpp/liboamcpp.cpp | 2 --
 oam/oamcpp/liboamcpp.h   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index a8a9bfd3d..7ce05e2d9 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -82,8 +82,6 @@ using namespace oam;
 using namespace logging;
 using namespace BRM;
 
-string tmpdir;
-
 namespace oam
 {
 // flag to tell us ctrl-c was hit
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index cc2f620ca..39e2a51de 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -2521,6 +2521,7 @@ private:
      */
     void sendStatusUpdate(messageqcpp::ByteStream obs, messageqcpp::ByteStream::byte returnRequestType);
 
+	std::string tmpdir;
     std::string CalpontConfigFile;
     std::string AlarmConfigFile;
     std::string ProcessConfigFile;