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 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;