database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-05-31 11:41:14 +03:00
Code

Fix mergeup errors

Browse Source
This commit is contained in:
Andrew Hutchings 2017-11-30 15:15:01 +00:00
parent 37f673d121
commit ae9de1e426
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/ha_calpont_execplan.cpp
View File

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

2
oam/oamcpp/liboamcpp.cpp
View File

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

2
oam/oamcpp/liboamcpp.h
View File

@ -1488,7 +1488,7 @@ namespace oam
* @param DeviceNetworkConfig the Modules added * @param DeviceNetworkConfig the Modules added
* @param password Host Root Password * @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 /** @brief remove Module
* *

2
procmgr/main.cpp
View File

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

5
procmon/processmonitor.h
View File

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