database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix my.cnf clash

Browse Source 
This patch:

* Moves ColumnStore my.cnf to /etc/my.cnf.d/columnstore.cnf
* Removes unneeded entries from columnstore.cnf
* Removes some things that used my.cnf and are now dead
* Also removes utils/scenarios
* Modifies things that use extra defaults file to use the standard one
* Makes sure that C++11 standard is used for older CMake versions

With this patch we no longer need to set -DINSTALL_SYSCONF2DIR and
-DINSTALL_SYSCONFDIR when building MariaDB server.
This commit is contained in:
Andrew Hutchings
2019-09-04 18:51:02 +01:00
parent 4d2a1594aa
commit 74d68b4db3
434 changed files with 101 additions and 7866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
procmon/processmonitor.cpp
View File

@ -5117,7 +5117,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
log.writeLog(__LINE__, "changeMyCnf function called for " + type, LOG_TYPE_DEBUG);
string mycnfFile = startup::StartUp::installDir() + "/mysql/my.cnf";
string mycnfFile = "/etc/my.cnf.d/columnstore.cnf";
ifstream file (mycnfFile.c_str());
if (!file)
@ -5126,8 +5126,6 @@ int ProcessMonitor::changeMyCnf(std::string type)
return oam::API_FAILURE;
}
string dbDir = startup::StartUp::installDir() + "/mysql/db";
//get server-id based on ExeMgrx setup
string serverID = "0";
string localModuleName = config.moduleName();
@ -6691,7 +6689,7 @@ int ProcessMonitor::runUpgrade()
for ( int i = 0 ; i < 10 ; i++ )
{
//run upgrade script
string cmd = startup::StartUp::installDir() + "/mysql/bin/mysql_upgrade --defaults-file=" + startup::StartUp::installDir() + "/mysql/my.cnf " +
string cmd = startup::StartUp::installDir() + "/mysql/bin/mysql_upgrade " +
passwordOption + " > " + tmpLog + " 2>&1";
log.writeLog(__LINE__, "runUpgrade, cmd = " + cmd, LOG_TYPE_DEBUG);