diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index db670ff70..a8685eb89 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -2468,7 +2468,7 @@ namespace oam /** @brief check and get mysql user password */ - EXPORT std::string getMySQLPassword(bool bypassConfig = false); + EXPORT std::string getMySQLPassword(); /** @brief update fstab with dbroot mounts */ diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index 310c9fcd3..c27d77770 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -458,14 +458,6 @@ int main(int argc, char *argv[]) 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 ModuleConfig moduleconfig; diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index f54141ae2..dcac5be93 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -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 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)