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 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

8
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -899,9 +899,9 @@ int processCommand(string* arguments)
SendToWES(oam, bs);
}
#if _MSC_VER
if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0))
else if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0))
#else
if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0)
else if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0)
#endif
{
ByteStream bs;
@ -913,9 +913,9 @@ int processCommand(string* arguments)
SendToWES(oam, bs);
}
#if _MSC_VER
if (_strnicmp(arguments[1].c_str(), "status", 6) == 0))
else if (_strnicmp(arguments[1].c_str(), "status", 6) == 0))
#else
if (strncasecmp(arguments[1].c_str(), "status", 6) == 0)
else if (strncasecmp(arguments[1].c_str(), "status", 6) == 0)
#endif
{
ByteStream bs;

2
oamapps/postConfigure/postConfigure.cpp
View File

@ -5338,7 +5338,7 @@ bool storageSetup(bool amazonInstall)
if ( (glusterInstalled == "y" && singleServerInstall != "1") && hadoopInstalled == "y" )
{
cout << "There are 5 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
cout << "There are 4 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
prompt = "Select the type of Data Storage [1=internal, 2=external, 3=DataRedundancy, 4=hdfs] (" + storageType + ") > ";
}

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;