Merge pull request #614 from mariadb-corporation/MCOL-520-1.2.1

MCOL - change to get buildbot to work

build/columnstore_startup.sh

@@ -21,7 +21,7 @@ for arg in "$@"; do
 	fi
 done
 
-$installdir/bin/post-install --installdir=/usr/local/mariadb/columnstore
+bash -x $installdir/bin/post-install --installdir=/usr/local/mariadb/columnstore
 echo -e "1\n1\n1\n1\n1\n1\n" | $installdir/bin/postConfigure -i $installdir
 if [ $? -eq 0 ]; then
 	exit 0

cpackEngineRPM.cmake

@@ -132,7 +132,6 @@ SET(CPACK_RPM_platform_USER_FILELIST
 "/usr/local/mariadb/columnstore/bin/post-mysqld-install"
 "/usr/local/mariadb/columnstore/bin/pre-uninstall"
 "/usr/local/mariadb/columnstore/bin/PrimProc"
-"/usr/local/mariadb/columnstore/bin/upgrade-columnstore.sh"
 "/usr/local/mariadb/columnstore/bin/run.sh"
 "/usr/local/mariadb/columnstore/bin/columnstore"
 "/usr/local/mariadb/columnstore/bin/columnstoreSyslog"

oam/install_scripts/post-install

@@ -18,9 +18,16 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
 		rpmmode="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
+		installdirTmp="`echo $arg | awk -F= '{print $2}'`"
+		if [ $installdirTmp == $installdir ] ; then
+			user=root
+			export COLUMNSTORE_INSTALL_DIR=$installdir
+			export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+		else
+			installdir=$installdirTmp
+			prefix=`dirname $installdir`
                 prefix=`dirname $prefix`
+		fi                
 	elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
 		user="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--quiet'` -eq 7 ]; then

utils/startup/installdir.cpp

@@ -97,11 +97,13 @@ const string StartUp::tmpDir()
 
     if (!cfStr.empty())
         *fTmpDirp = cfStr;
+    
+    return *fTmpDirp;
 
 #else
 
 	//check for non-root user 
-    const char* p = getenv("HOME");
+/*    const char* p = getenv("HOME");
 	string homedir = p;
 
     if (homedir == "/root")
@@ -128,10 +130,23 @@ const string StartUp::tmpDir()
 
 		*fTmpDirp = *fTmpDirp + "/.tmp";
 	}
+*/
+	Config* sysConfig = Config::makeConfig();
+
+	string TempFileDir;
+
+	try
+	{
+		TempFileDir = sysConfig->getConfig("SystemConfig", "SystemTempFileDir");
+	}
+	catch (...)
+	{}
+	
+	return TempFileDir;
 	
 #endif
 
-    return *fTmpDirp;
+
 }
 
 }