1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

Made the SKIP_OAM_INIT checks happen at run time vs build time.

This commit is contained in:
Patrick LeBlanc
2020-01-15 16:31:07 -05:00
parent 39de72d8f8
commit d01df95144
9 changed files with 65 additions and 73 deletions

View File

@ -111,7 +111,7 @@ void OamCache::checkReload()
// Restore for Windows when we support multiple PMs
while (it != uniquePids.end())
{
#if !defined(SKIP_OAM_INIT)
if (getenv("SKIP_OAM_INIT") == NULL)
{
try
{
@ -180,10 +180,11 @@ void OamCache::checkReload()
break;
}
}
#else
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
#endif
else
{
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
}
it++;
}
@ -346,4 +347,3 @@ string OamCache::getModuleName()
}
} /* namespace oam */