Fix mergeup errors

dbcon/mysql/ha_calpont_execplan.cpp

@@ -38,7 +38,6 @@
 #include <cerrno>
 #include <cstring>
 #include <time.h>
-//#define NDEBUG
 #include <cassert>
 #include <vector>
 #include <map>
@@ -2290,8 +2289,6 @@ CalpontSystemCatalog::ColType colType_MysqlToIDB (const Item* item)
 			{
 				if (ct.colWidth < 20)
 					ct.colWidth = 20; // for infinidb date length
-				if (ct.colWidth > 65535)
-					ct.colWidth = 65535;
 			}
 			// @bug5083. MySQL gives string type for date/datetime column.
 			// need to adjust here.

oam/oamcpp/liboamcpp.cpp

@@ -2811,6 +2811,8 @@ namespace oam
 		// Get Server Type Install ID
 	
 		serverTypeInstall = atoi(sysConfig->getConfig("Installation", "ServerTypeInstall").c_str());
+
+        sysConfig;
 	}
 	catch (...) {}
 

oam/oamcpp/liboamcpp.h

@@ -1488,7 +1488,7 @@ namespace oam
              * @param DeviceNetworkConfig the Modules added
              * @param password Host Root Password
             */
-            EXPORT void addModule(DeviceNetworkList devicenetworklist, const std::string password);
+            EXPORT void addModule(DeviceNetworkList devicenetworklist, const std::string password, const std::string mysqlpw);
 
             /** @brief remove Module
              *

procmgr/main.cpp

@@ -501,8 +501,6 @@ static void startMgrProcessThread()
 	SystemModuleTypeConfig systemmoduletypeconfig;
 	ModuleTypeConfig PMSmoduletypeconfig;
 	ALARMManager aManager;
-	
-	int waitTime = 90;
 
 	int waitTime = 180; 
 	

procmon/processmonitor.h

@@ -500,11 +500,6 @@ public:
 	int changeMyCnf(std::string type);
 
 
-    /**
-     *@brief run MariaDB Command Line script
-     */
-        int runMariaDBCommandLine(std::string command);
-
     /**
      *@brief run MariaDB Command Line script
      */