database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
parent 6c4afdf18b 0dd33c6f75
commit 020b211bb7
83 changed files with 469 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/oamcpp/CMakeLists.txt
View File

@ -10,6 +10,8 @@ add_library(oamcpp SHARED ${oamcpp_LIB_SRCS})
target_link_libraries(oamcpp )
target_compile_options(oamcpp PRIVATE -Wno-unused-result)
set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

21
oam/oamcpp/liboamcpp.cpp
View File

@ -154,12 +154,14 @@ Oam::Oam()
char* p = getenv("USER");
if (p && *p)
USER = p;
USER = p;
userDir = USER;
if ( USER != "root")
userDir = "home/" + USER;
{
userDir = "home/" + USER;
}
tmpdir = startup::StartUp::tmpDir();
@ -2901,8 +2903,6 @@ oamModuleInfo_t Oam::getModuleInfo()
// Get Server Type Install ID
serverTypeInstall = atoi(sysConfig->getConfig("Installation", "ServerTypeInstall").c_str());
sysConfig;
}
catch (...) {}
@ -8563,9 +8563,6 @@ std::string Oam::createEC2Volume(std::string size, std::string name)
oldFile.close();
if ( volumeName == "unknown" )
return "failed";
if ( volumeName == "unknown" )
return "failed";
@ -8601,7 +8598,7 @@ bool Oam::attachEC2Volume(std::string volumeName, std::string deviceName, std::s
writeLog("attachEC2Volume: Attach failed, call detach:" + volumeName + " " + instanceName + " " + deviceName, LOG_TYPE_ERROR );
detachEC2Volume(volumeName);
}
}
else
return true;
}
@ -10470,12 +10467,8 @@ void Oam::sendStatusUpdate(ByteStream obs, ByteStream::byte returnRequestType)
if (ibs.length() > 0)
{
ibs >> returnRequestType;
if ( returnRequestType == returnRequestType )
{
processor.shutdown();
return;
}
processor.shutdown();
return;
}
else
{