database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-10 22:42:30 +03:00
Code Activity

Merge pull request #808 from mariadb-corporation/develop-merge-up-20190729

Browse Source 
Merge develop-1.2 into develop
This commit is contained in:
Roman Nozdrin
2019-08-13 11:55:22 +03:00
committed by GitHub
parent 196a50ef11 7af9771319
commit 6cdca1330b
36 changed files with 365 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oamapps/serverMonitor/diskMonitor.cpp
View File

@@ -267,7 +267,7 @@ void diskMonitor()
blksize = buf.f_bsize;
blocks = buf.f_blocks;
freeblks = buf.f_bfree;
freeblks = buf.f_bavail;
totalBlocks = blocks * blksize;
free = freeblks * blksize;
@@ -396,7 +396,7 @@ void diskMonitor()
blksize = buf.f_bsize;
blocks = buf.f_blocks;
freeblks = buf.f_bfree;
freeblks = buf.f_bavail;
totalBlocks = blocks * blksize;
free = freeblks * blksize;