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' into mcol-61

Browse Source 
Conflicts:
	oam/install_scripts/post-install
	oam/oamcpp/liboamcpp.cpp
This commit is contained in:
David Hill
2016-11-17 15:39:53 +00:00
parent 3b33601a20 75fc2d9ae0
commit 7a833a9dfb
23 changed files with 740 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/oamcpp/liboamcpp.cpp
View File

@ -9614,8 +9614,8 @@ namespace oam
// not root user
// The stat above may fail for non-root because of permissions
// This is a non-optimal solution
string cmd = "pgrep ProcMon";
if (system(cmd.c_str()) == 1)
string cmd = "pgrep ProcMon > /dev/null 2>&1";
if (system(cmd.c_str()) == 0)
{
return true;
}