1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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

@ -9396,9 +9396,6 @@ int Oam::checkGlusterLog(std::string logFile, std::string& msg)
******************************************************************************************/
std::string Oam::getMySQLPassword()
{
return oam::UnassignedName;
string mysqlUser = "root";
string USER = "root";
@ -9422,7 +9419,7 @@ std::string Oam::getMySQLPassword()
if (!file)
{
writeLog("getMySQLPassword: doesn't exist: " + fileName, LOG_TYPE_DEBUG);
exceptionControl("getMySQLPassword", API_FILE_OPEN_ERROR);
return oam::UnassignedName;
}
char line[400];