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

MCOL-938

Browse Source
This commit is contained in:
david hill
2017-10-23 14:50:43 -05:00
parent 539edb51be
commit 58a77b708c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
procmon/processmonitor.cpp
View File

@@ -4659,7 +4659,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
string dbDir = startup::StartUp::installDir() + "/mysql/db"; string dbDir = startup::StartUp::installDir() + "/mysql/db";
if ( type == "master" ) /* if ( type == "master" )
{ {
// set master replication entries // set master replication entries
vector <string> lines; vector <string> lines;
@@ -4699,10 +4699,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
close(fd); close(fd);
} }
*/
if ( type == "slave" ) // if ( type == "slave" )
{ // {
//get slave id based on ExeMgrx setup //get server-id based on ExeMgrx setup
string slaveID = "0"; string slaveID = "0";
string slaveModuleName = config.moduleName(); string slaveModuleName = config.moduleName();
for ( int id = 1 ; ; id++ ) for ( int id = 1 ; ; id++ )
@@ -4755,7 +4755,6 @@ int ProcessMonitor::changeMyCnf(std::string type)
return oam::API_FAILURE; return oam::API_FAILURE;
} }
// set slave replication entries // set slave replication entries
vector <string> lines; vector <string> lines;
char line[200]; char line[200];
@@ -4804,7 +4803,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
newFile.close(); newFile.close();
close(fd); close(fd);
} // }
/* if ( type == "disable" ) /* if ( type == "disable" )
{ {