1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00

Merge branch 'develop' into S3-project

This commit is contained in:
Patrick LeBlanc
2019-08-14 15:37:14 -05:00
245 changed files with 3356 additions and 3224 deletions

View File

@@ -906,9 +906,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;
@@ -920,9 +920,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;

View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License