1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00

MCOL-481 fix

This commit is contained in:
david hill
2017-01-19 15:16:17 -06:00
parent 568e9b0168
commit 8f2bfb58de
2 changed files with 21 additions and 48 deletions

View File

@@ -10054,15 +10054,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
try {
Config* sysConfig = Config::makeConfig();
if ( sysConfig->getConfig("DBRM_Controller", "NumWorkers") == "1" ) {
//disable mysqlrep
log.writeLog(__LINE__, "Disable MySQL Replication", LOG_TYPE_DEBUG);
try {
oam.setSystemConfig("MySQLRep", "n");
}
catch(...) {}
enable = false;
distributeDB = true;
return oam::API_SUCCESS;
}
}
catch(...)
@@ -10080,17 +10072,9 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
catch(...)
{}
if ( moduletypeconfig.ModuleCount < 1 )
if ( moduletypeconfig.ModuleCount < 2 )
{
//disable mysqlrep
log.writeLog(__LINE__, "Disable MySQL Replication", LOG_TYPE_DEBUG);
try {
oam.setSystemConfig("MySQLRep", "n");
}
catch(...) {}
enable = false;
distributeDB = true;
return oam::API_SUCCESS;
}
}