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

25
procmon/processmonitor.cpp
View File

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