database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-520 - added in mysql_upgrade script and fix issue with shared memory not cleared at shutdown

Browse Source
This commit is contained in:
David Hill
2018-11-03 17:06:36 -05:00
parent 988c573166
commit cf6820d342
8 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@ -305,6 +305,19 @@ void reportThread(string reporttype)
cmd = installDir + "/bin/mcsadmin getSystemInfo >> " + outputFile;
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo '******************** System Directories ********************' >> " + outputFile;
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo '################# mcsadmin getSystemDirectories ################# ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = installDir + "/bin/mcsadmin getSystemDirectories >> " + outputFile;
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo '******************** System Configuration File ********************' >> " + outputFile;

4
oamapps/postConfigure/helpers.cpp
View File

@ -39,7 +39,6 @@ using namespace installer;
#include "installdir.h"
extern string mysqlpw;
string pwprompt = " ";
string masterLogFile = oam::UnassignedName;
@ -347,7 +346,6 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
ByteStream::byte requestID = RUNUPGRADE;
msg << requestID;
msg << mysqlpw;
int returnStatus = oam::API_SUCCESS;
@ -385,7 +383,7 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
{
string tmpDir = startup::StartUp::tmpDir();
cout << "ERROR: Error return in running the MariDB Columnstore Upgrade, check " + tmpDir + "/upgrade*.logs on " << (*pt).DeviceName << endl;
cout << "ERROR: Error return in running the MariDB Columnstore Upgrade, check " + tmpDir + "/mysql_upgrade.log on " << (*pt).DeviceName << endl;
return returnStatus;
}
}

1
oamapps/postConfigure/postConfigure.cpp
View File

@ -200,7 +200,6 @@ string tmpDir;
string HOME = "/root";
string SUDO = "";
extern string pwprompt;
string mysqlpw = oam::UnassignedName;
extern const char* pcommand;
extern string prompt;