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

Merge pull request #1016 from dhall-MariaDB/MCOL-3744

Browse Source 
MCOL-3744 mcssystemready to work with SKIP_OAM_INIT
This commit is contained in:
benthompson15
2020-01-30 14:29:30 -06:00
committed by Patrick LeBlanc
parent 95f0caaf63
commit 7a16877aae
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dbcon/mysql/ha_mcs_client_udfs.cpp
View File

@ -294,13 +294,24 @@ extern "C"
try
{
oam.getSystemStatus(systemstatus);
if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
if (getenv("SKIP_OAM_INIT"))
{
return 1;
if (dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{
return 1;
}
}
else
{
oam.getSystemStatus(systemstatus);
if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{
return 1;
}
}
}
catch (...)