1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

Merge pull request #1004 from pleblanc1976/runtime-disable-oam

Runtime disable oam
This commit is contained in:
Andrew Hutchings
2020-01-17 10:31:05 -08:00
committed by Patrick LeBlanc
parent a7724ac3c7
commit 5ff131e726
10 changed files with 81 additions and 82 deletions

View File

@ -547,7 +547,7 @@ void WESDHandler::setup()
}
// getModuleStatus will take too long. Also to test in development
#if !defined(_MSC_VER) && !defined(SKIP_OAM_INIT)
if (getenv("SKIP_OAM_INIT") == NULL)
{
vector<unsigned int>& aVec = fRef.fCmdArgs.getPmVec();
@ -578,8 +578,6 @@ void WESDHandler::setup()
}
}
}
#endif
int rtn = fDbrm.getSystemReady();
@ -2997,4 +2995,3 @@ void WESDHandler::setDisconnectFailure(bool Flag)
//------------------------------------------------------------------------------
} /* namespace WriteEngine */