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

Merge branch 'develop-1.1' into 1.1-merge-up-2018-12-20b

Browse Source
This commit is contained in:
Andrew Hutchings
2018-12-20 20:55:00 +00:00
parent a6df2be47b e28924b60f
commit 82bd9e29f5
9 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/oamcpp/liboamcpp.cpp
View File

@ -3236,7 +3236,7 @@ void Oam::SuspendWrites(GRACEFUL_FLAG gracefulflag, ACK_FLAG ackflag)
switch (returnStatus)
{
case API_SUCCESS:
cout << endl << "Suspend Calpont Database Writes Request successfully completed" << endl;
cout << endl << "Suspend MariaDB Columnstore Database Writes Request successfully completed" << endl;
break;
case API_FAILURE_DB_ERROR:
@ -10821,7 +10821,7 @@ bool Oam::waitForSystem(PROC_MGT_MSG_REQUEST request, messageqcpp::IOSocket& ios
}
catch (...)
{
writeLog("Communication with calpont console failed while waiting for transactions", LOG_TYPE_ERROR);
writeLog("Communication with MariaDB ColumnStore Admin console failed while waiting for transactions", LOG_TYPE_ERROR);
}
// writeLog("Returning from wait with value " + itoa(ret), LOG_TYPE_INFO );