database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop-1.1' into dev-merge-up-20180409

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-09 19:15:18 +01:00
parent 7075b9571d 3eb36e6bf9
commit 280dcb44bf
31 changed files with 304 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/oamcpp/liboamcpp.h
View File

@ -2481,6 +2481,10 @@ public:
bool checkSystemRunning();
/** @brief wait for system to be active
*/
EXPORT void waitForActive();
private:
int sendMsgToProcMgr3(messageqcpp::ByteStream::byte requestType, alarmmanager::AlarmList& alarmlist, const std::string date);