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

change

Browse Source
This commit is contained in:
david hill
2016-05-17 10:56:37 -05:00
parent 00f45b6ec9
commit 0e9530f28c
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
oam/install_scripts/module_installer.sh
View File

@@ -54,15 +54,17 @@ fi
export INFINIDB_INSTALL_DIR=$installdir export INFINIDB_INSTALL_DIR=$installdir
cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud` cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud`
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then if [ $module = "um" ]; then
cp $INFINIDB_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1 if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
cp $INFINIDB_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1
if test -f $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab ; then
echo "Setup fstab on Module" if test -f $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab ; then
touch /etc/fstab echo "Setup fstab on Module"
rm -f /etc/fstab.columnstoreSave touch /etc/fstab
mv /etc/fstab /etc/fstab.columnstoreSave rm -f /etc/fstab.columnstoreSave
cat $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab cp /etc/fstab /etc/fstab.columnstoreSave
cat $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
fi
fi fi
fi fi

12
procmgr/processmanager.cpp
View File

@@ -4439,15 +4439,15 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
if ( packageType == "deb" ) if ( packageType == "deb" )
separator = "_"; separator = "_";
//mariadb //mariadb
calpontPackage = homedir + "/mariadbcolumnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; calpontPackage = homedir + "/mariadb-columnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
mysqlPackage = homedir + "/mariadbcolumnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; mysqlPackage = homedir + "/mariadb-columnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
mysqldPackage = homedir + "/mariadbcolumnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; mysqldPackage = homedir + "/mariadb-columnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
calpontPackage1 = homedir + "/mariadbcolumnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; calpontPackage1 = homedir + "/mariadb-columnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
calpontPackage2 = homedir + "/mariadbcolumnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType; calpontPackage2 = homedir + "/mariadb-columnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release + "*." + packageType;
} }
else else
{ {
calpontPackage = homedir + "/mariadbcolumnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz"; calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz";
mysqlPackage = calpontPackage; mysqlPackage = calpontPackage;
mysqldPackage = calpontPackage; mysqldPackage = calpontPackage;
} }