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

MCOL-943 non-root changes

Browse Source
This commit is contained in:
david hill
2017-10-18 14:33:34 -05:00
parent fa49afa2a5
commit 7a0e0f629b
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/oamcpp/liboamcpp.h
View File

@@ -2468,7 +2468,7 @@ namespace oam
/** @brief check and get mysql user password /** @brief check and get mysql user password
*/ */
EXPORT std::string getMySQLPassword(bool bypassConfig = false); EXPORT std::string getMySQLPassword();
/** @brief update fstab with dbroot mounts /** @brief update fstab with dbroot mounts
*/ */

8
oamapps/postConfigure/postConfigure.cpp
View File

@@ -458,14 +458,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
//if binary install, then run post-install just in case the user didnt run it
if ( EEPackageType == "binary" )
{
//run post install
cmd = installDir + "/bin/post-install --installdir=" + installDir + " > /dev/null 2>&1";
system(cmd.c_str());
}
//check for local ip address as pm1 //check for local ip address as pm1
ModuleConfig moduleconfig; ModuleConfig moduleconfig;

25
procmon/processmonitor.cpp
View File

@@ -4745,10 +4745,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
buf = "server-id = 1"; buf = "server-id = 1";
} }
pos = buf.find("# binlog_format=ROW",0); // pos = buf.find("# binlog_format=ROW",0);
if ( pos != string::npos ) { // if ( pos != string::npos ) {
buf = "binlog_format=ROW"; // buf = "binlog_format=ROW";
} // }
pos = buf.find("infinidb_local_query=1",0); pos = buf.find("infinidb_local_query=1",0);
if ( pos != string::npos && pos == 0) { if ( pos != string::npos && pos == 0) {
@@ -4871,10 +4871,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
} }
} }
pos = buf.find("binlog_format=ROW",0); // pos = buf.find("binlog_format=ROW",0);
if ( pos != string::npos && pos == 0 ) { // if ( pos != string::npos && pos == 0 ) {
buf = "# binlog_format=ROW"; // buf = "# binlog_format=ROW";
} // }
//output to temp file //output to temp file
lines.push_back(buf); lines.push_back(buf);
@@ -4893,7 +4893,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
close(fd); close(fd);
} }
if ( type == "disable" ) /* if ( type == "disable" )
{ {
// set master replication entries // set master replication entries
vector <string> lines; vector <string> lines;
@@ -4937,11 +4937,6 @@ int ProcessMonitor::changeMyCnf(std::string type)
} }
} }
pos = buf.find("slave-skip-errors=all",0);
if ( pos != string::npos ) {
buf = "# slave-skip-errors=all";
}
//output to temp file //output to temp file
lines.push_back(buf); lines.push_back(buf);
} }
@@ -4958,7 +4953,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
close(fd); close(fd);
} }
*/
// set owner and permission // set owner and permission
string cmd = "chmod 664 " + mycnfFile + " >/dev/null 2>&1"; string cmd = "chmod 664 " + mycnfFile + " >/dev/null 2>&1";
if ( !rootUser) if ( !rootUser)