1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00

MCOL-3551 Use generic MariaDB Server paths

This branch enforces the use of generic MariaDB server paths for their
binaries and data rather than custom paths.

/usr/local/mariadb/columnstore is now only for columnstore with this
patch.

It should be noted that this removes the auto-mounting of external
MariaDB UM data storage for AWS.

This is also a fix for MCOL-3510 after buildbot changes are made.

Also... MCOL-3552 Use columnstore.cnf to load plugins

The ColumnStore plugins now load using a columnstore.cnf instead of a
SQL sequence to be more in-line with MariaDB's methods.
This commit is contained in:
Andrew Hutchings
2019-10-10 14:28:02 +01:00
parent 5fd0873215
commit ebb22a96a3
58 changed files with 145 additions and 2143 deletions

View File

@@ -205,7 +205,7 @@ void reportThread(string reporttype)
cmd = "mv -f " + tmpDir + "/" + localModule + "_logReport.tar.gz .";
system(cmd.c_str());
cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz " + installDir + "/mysql/db/*.err* 2>/dev/null";
cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz /var/log/mysql/*.err* 2>/dev/null";
system(cmd.c_str());
// run log config on local server
@@ -873,7 +873,7 @@ int main(int argc, char* argv[])
{
// check if mysql is supported and get info
string logFile = tmpDir + "/idbmysql.log";
string columnstoreMysql = installDir + "/mysql/bin/mysql -u root ";
string columnstoreMysql = "mysql -u root ";
string cmd = columnstoreMysql + " -e 'status' > " + logFile + " 2>&1";
system(cmd.c_str());
@@ -947,7 +947,7 @@ int main(int argc, char* argv[])
if (!FAILED)
{
// check if mysql is supported and get info
string columnstoreMysql = installDir + "/mysql/bin/mysql -u root " + pwprompt;
string columnstoreMysql = "mysql -u root " + pwprompt;
string cmd = columnstoreMysql + " -V > /dev/null 2>&1";
int ret = system(cmd.c_str());