Merge pull request #1756 from benthompson15/MCOL-4193-dev

MCOL-4193-dev
2025-08-01 06:46:55 +03:00 · 2021-02-12 22:41:29 +03:00
parent 6bd1ed4136 846f7fb29b
commit 229fd5d1bd
138 changed files with 311 additions and 69494 deletions
--- a/dbcon/dmlpackageproc/commandpackageprocessor.cpp
+++ b/dbcon/dmlpackageproc/commandpackageprocessor.cpp
@ -36,8 +36,6 @@
 #include "we_messages.h"
 #include "we_ddlcommandclient.h"
 #include "oamcache.h"
-#include "alarmglobal.h"
-#include "alarmmanager.h"
 #include "liboamcpp.h"
 using namespace std;
 using namespace WriteEngine;
--- a/dbcon/joblist/distributedenginecomm.cpp
+++ b/dbcon/joblist/distributedenginecomm.cpp
@ -61,8 +61,6 @@ using namespace config;
 using namespace logging;

 #include "liboamcpp.h"
-#include "alarmmanager.h"
-using namespace alarmmanager;
 using namespace oam;

 #include "jobstep.h"
--- a/dbcon/mysql/ha_mcs_client_udfs.cpp
+++ b/dbcon/mysql/ha_mcs_client_udfs.cpp
@ -290,7 +290,6 @@ extern "C"
        long long rtn = 0;
        Oam oam;
        DBRM dbrm(true);
-        SystemStatus systemstatus;

        try
        {