Merge pull request #615 from mariadb-corporation/MCOL-520-bash

MCOL-520 remove debug bash -x

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

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

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;