database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-25 20:23:16 +03:00
Code Activity

mcol-61 and mcol-404 fix

Browse Source
This commit is contained in:
David Hill
2016-11-18 19:55:48 +00:00
parent 2638c05e26
commit 23d38aa503
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oam/install_scripts/post-install
View File

@@ -250,7 +250,7 @@ The next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure --installdir=$installdir
EOD EOD
else else
@@ -282,13 +282,13 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
. $installdir/bin/setenv-hdfs-20 . $installdir/bin/setenv-hdfs-20
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure --installdir=$installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure --installdir=$installdir
EOD EOD
else else
@@ -321,13 +321,13 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath
. $installdir/bin/setenv-hdfs-12 . $installdir/bin/setenv-hdfs-12
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure --installdir=$installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure --installdir=$installdir
EOD EOD
else else

2
oam/install_scripts/rsync.sh
View File

@@ -26,7 +26,7 @@ if { $PASSWORD == "ssh" } {
set PASSWORD "" set PASSWORD ""
} }
set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME$@SERVER:$INSTALLDIR/mysql/db/" set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME@$SERVER:$INSTALLDIR/mysql/db/"
# #
# run command # run command

2
oamapps/postConfigure/helpers.cpp
View File

@@ -491,7 +491,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 ); returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 );
if ( returnStatus != API_SUCCESS) { if ( returnStatus != API_SUCCESS) {
cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl; cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist*.logs on " << masterModule << endl;
return returnStatus; return returnStatus;
} }

6
oamapps/postConfigure/postConfigure.cpp
View File

@@ -336,17 +336,13 @@ int main(int argc, char *argv[])
// for backward compatibility // for backward compatibility
else if( string("-n") == argv[i] ) else if( string("-n") == argv[i] )
noPrompting = true; noPrompting = true;
else if( string("-i") == argv[i] ) { else if( string("--installdir=") == argv[i] ) {
i++; i++;
if (i >= argc ) { if (i >= argc ) {
cout << " ERROR: install dir not provided" << endl; cout << " ERROR: install dir not provided" << endl;
exit (1); exit (1);
} }
installDir = argv[i]; installDir = argv[i];
if ( installDir.find("-") != string::npos ) {
cout << " ERROR: Valid install dir not provided" << endl;
exit (1);
}
} }
else if( string("-port") == argv[i] ) { else if( string("-port") == argv[i] ) {
i++; i++;