database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-28 14:39:00 -05:00
parent 3393bd1855
commit 2f0fb500df
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
oam/install_scripts/pre-uninstall
View File

@@ -64,12 +64,12 @@ else
rm -f /etc/profile.d/columnstoreAlias.sh
fi
#remove log file directories
if [ $user == "root" ]; then
rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
fi
rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1\
# delete Mariab Columnstore shared memory segments
@@ -77,12 +77,13 @@ $installdir/bin/clearShm > /dev/null 2>&1
#get temp directory
tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir`
# delete tmp files
rm -rf $tmpDir/*
if [[ $tmpDir = *"tmp" ]]; then
# delete tmp files
rm -rf $tmpDir/*
fi
rm -f $installdir/local/*.columnstore
rm -rf $installdir/local/etc/
rm -f $installdir/data/bulk${tmpDir}job/* >/dev/null 2>&1
rm -f $installdir/data/bulk/tmp/job/* >/dev/null 2>&1
rm -f $installdir/local/moveDbrootTransactionLog
lockdir=`$installdir/bin/getConfig Installation LockFileDirectory`

16
oamapps/postConfigure/postConfigure.cpp
View File

@@ -1806,8 +1806,8 @@ int main(int argc, char* argv[])
//
// Module Configuration
//
cout << endl;
cout << "===== Setup the Module Configuration =====" << endl << endl;
cout << endl << endl;
cout << "===== Setup the Module Configuration =====" << endl;
if (amazonInstall)
{
@@ -3469,7 +3469,7 @@ int main(int argc, char* argv[])
( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) )
{
//run the mysql / mysqld setup scripts
cout << endl << "===== Running the MariaDB ColumnStore MariaDB Server setup scripts =====" << endl << endl;
cout << endl << "===== Running the MariaDB ColumnStore MariaDB Server setup scripts =====" << endl;
checkMysqlPort(mysqlPort, sysConfig);
@@ -3485,8 +3485,8 @@ int main(int argc, char* argv[])
{
cout << endl;
cout << "Next step is to enter the password to access the other Servers." << endl;
cout << "This is either your password or you can default to using a ssh key" << endl;
cout << "If using a password, the password needs to be the same on all Servers." << endl << endl;
cout << "This is either user password or you can default to using a ssh key" << endl;
cout << "If using a user password, the password needs to be the same on all Servers." << endl << endl;
if ( noPrompting ) {
cout << "Enter password, hit 'enter' to default to using a ssh key, or 'exit' > " << endl;
@@ -3573,14 +3573,14 @@ int main(int argc, char* argv[])
if ( EEPackageType == "rpm" )
{
cout << "Performing a MariaDB ColumnStore System install using RPM packages" << endl;
cout << "located in the " + HOME + " directory." << endl << endl;
cout << "located in the " + HOME + " directory." << endl;
}
else
{
if ( EEPackageType == "binary" )
{
cout << "Performing a MariaDB ColumnStore System install using a Binary package" << endl;
cout << "located in the " + HOME + " directory." << endl << endl;
cout << "located in the " + HOME + " directory." << endl;
}
else
{
@@ -4851,7 +4851,7 @@ bool storageSetup(bool amazonInstall)
return true;
}
cout << "===== Setup Storage Configuration =====" << endl << endl;
cout << "===== Setup Storage Configuration =====" << endl;
string storageType;