database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Updated with latest InfiniDB Develop (4.6.6)

Browse Source
This commit is contained in:
David Hall
2016-01-14 10:27:21 -06:00
parent f6afc42dd0
commit 1bd427486c
27 changed files with 556 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
oam/oamcpp/liboamcpp.cpp
View File

@ -8191,7 +8191,7 @@ namespace oam
bool Oam::disableMySQLRep()
{
// build and send msg
int returnStatus = sendMsgToProcMgr(DISABLEMYSQLREP);
int returnStatus = sendMsgToProcMgr(DISABLEMYSQLREP, oam::UnassignedName, FORCEFUL, ACK_YES);
if (returnStatus != API_SUCCESS)
exceptionControl("disableMySQLRep", returnStatus);
@ -8522,17 +8522,17 @@ namespace oam
string target;
ByteStream::byte status;
// get current requesting process, an error will occur if process is a UI tool (not kept in Status Table)
// this will be used to determine if this is a manually or auto request down within Process-Monitor
bool requestManual;
myProcessStatus_t t;
try {
t = getMyProcessStatus();
requestManual = false; // set to auto
}
catch (...) {
requestManual = true; // set to manual
}
// get current requesting process, an error will occur if process is a UI tool (not kept in Status Table)
// this will be used to determine if this is a manually or auto request down within Process-Monitor
bool requestManual;
myProcessStatus_t t;
try {
t = getMyProcessStatus();
requestManual = false; // set to auto
}
catch (...) {
requestManual = true; // set to manual
}
// setup message
msg << (ByteStream::byte) REQUEST;
@ -9079,6 +9079,8 @@ namespace oam
if ( (cloud == "amazon-ec2" || cloud == "amazon-vpc") &&
DBRootStorageType == "external" )
{
writeLog("amazonReattach function started ", LOG_TYPE_DEBUG );
//get Instance Name for to-pm
string toInstanceName = oam::UnassignedName;
try