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

MCOL-3744 mcssystemready to work with SKIP_OAM_INIT

Browse Source
This commit is contained in:
David Hall
2020-01-24 12:33:03 -06:00
parent 011cc70e17
commit 2c814bd3ed
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 try
{ {
oam.getSystemStatus(systemstatus); if (getenv("SKIP_OAM_INIT"))
if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{ {
return 1; if (dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{
return 1;
}
}
else
{
oam.getSystemStatus(systemstatus);
if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady()
&& dbrm.getSystemQueryReady())
{
return 1;
}
} }
} }
catch (...) catch (...)