1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-24 08:41:09 +03:00

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

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

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