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

Mcol 927

build/postInstall_libs.sh

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

build/postInstall_platform.sh

@@ -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
 
-echo "MariaDB ColumnStore RPM install completed"

build/postInstall_storage_engine.sh

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

cpackEngineRPM.cmake

@@ -87,7 +87,7 @@ IF (EXISTS "/etc/SuSE-release")
     set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
 ENDIF ()
 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
     SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
 elseif (${SUSE_VERSION_NUMBER} EQUAL 12)

oam/install_scripts/columnstore.conf

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

oam/install_scripts/post-install

@@ -268,8 +268,11 @@ fi
 
 #log install message
 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
 hadoop=`which hadoop 2>/dev/null`
 if [ -z "$hadoop" ]; then