database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

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

Browse Source 
MCOL-520 remove debug bash -x
This commit is contained in:
Patrick LeBlanc
2018-11-08 12:17:45 -06:00
committed by GitHub
parent 1b0fbf654e f830955be9
commit a2717bbdc3
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/columnstore_startup.sh
View File

@@ -21,7 +21,7 @@ for arg in "$@"; do
fi fi
done 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 echo -e "1\n1\n1\n1\n1\n1\n" | $installdir/bin/postConfigure -i $installdir
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
exit 0 exit 0

2
oam/oamcpp/liboamcpp.cpp
View File

@@ -82,8 +82,6 @@ using namespace oam;
using namespace logging; using namespace logging;
using namespace BRM; using namespace BRM;
string tmpdir;
namespace oam namespace oam
{ {
// flag to tell us ctrl-c was hit // flag to tell us ctrl-c was hit

1
oam/oamcpp/liboamcpp.h
View File

@@ -2521,6 +2521,7 @@ private:
*/ */
void sendStatusUpdate(messageqcpp::ByteStream obs, messageqcpp::ByteStream::byte returnRequestType); void sendStatusUpdate(messageqcpp::ByteStream obs, messageqcpp::ByteStream::byte returnRequestType);
std::string tmpdir;
std::string CalpontConfigFile; std::string CalpontConfigFile;
std::string AlarmConfigFile; std::string AlarmConfigFile;
std::string ProcessConfigFile; std::string ProcessConfigFile;