database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

Merge pull request #400 from mariadb-corporation/MCOL-927

Browse Source 
Mcol 927
This commit is contained in:
benthompson15
2018-02-07 15:25:00 -06:00
committed by GitHub
parent ffcc4e94cc 22723ad468
commit 5f10898b36
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/postInstall_libs.sh
View File

@@ -7,5 +7,4 @@ fi
prefix=/usr/local prefix=/usr/local
echo "MariaDB ColumnStore RPM install completed"

1
build/postInstall_platform.sh
View File

@@ -9,4 +9,3 @@ prefix=/usr/local
test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode
echo "MariaDB ColumnStore RPM install completed"

1
build/postInstall_storage_engine.sh
View File

@@ -7,6 +7,5 @@ fi
prefix=/usr/local prefix=/usr/local
echo "MariaDB ColumnStore RPM install completed"

2
cpackEngineRPM.cmake
View File

@@ -87,7 +87,7 @@ IF (EXISTS "/etc/SuSE-release")
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}") set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF () ENDIF ()
if (${REDHAT_VERSION_NUMBER} EQUAL 6) if (${REDHAT_VERSION_NUMBER} EQUAL 6)
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs" "snappy") SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs" "mariadb-columnstore-shared" "snappy")
# Disable auto require as this will also try to pull Boost via RPM # Disable auto require as this will also try to pull Boost via RPM
SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no") SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
elseif (${SUSE_VERSION_NUMBER} EQUAL 12) elseif (${SUSE_VERSION_NUMBER} EQUAL 12)

2
oam/install_scripts/columnstore.conf
View File

@@ -1,2 +1,2 @@
/usr/local/mariadb/columnstore/lib /usr/local/mariadb/columnstore/lib
/usr/local/mariadb/columnstore/mysql/lib

7
oam/install_scripts/post-install
View File

@@ -268,8 +268,11 @@ fi
#log install message #log install message
test -f $installdir/post/functions && . $installdir/post/functions test -f $installdir/post/functions && . $installdir/post/functions
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****" if [ $user = "root" ]; then
$installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
else
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
fi
#setup hadoop #setup hadoop
hadoop=`which hadoop 2>/dev/null` hadoop=`which hadoop 2>/dev/null`
if [ -z "$hadoop" ]; then if [ -z "$hadoop" ]; then