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

MCOL-3744 mcssystemready to work with SKIP_OAM_INIT

dbcon/mysql/ha_mcs_client_udfs.cpp

@@ -293,6 +293,16 @@ extern "C"
         SystemStatus systemstatus;
 
         try
+        {
+            if (getenv("SKIP_OAM_INIT"))
+            {
+                if (dbrm.getSystemReady()
+                    && dbrm.getSystemQueryReady())
+                {
+                    return 1;
+                }
+            }
+            else
             {
                 oam.getSystemStatus(systemstatus);
 
@@ -303,6 +313,7 @@ extern "C"
                     return 1;
                 }
             }
+        }
         catch (...)
         {
             *error = 1;