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

update

Browse Source
This commit is contained in:
David Hill
2016-12-01 22:29:50 +00:00
parent eee1df2e4a
commit aac6fd6485
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
oam/install_scripts/post-mysql-install
View File

@@ -12,6 +12,7 @@ checkForError() {
if test -f $HOME/.my.cnf ; then if test -f $HOME/.my.cnf ; then
password=`cat $HOME/.my.cnf | grep password | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $3}'` password=`cat $HOME/.my.cnf | grep password | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $3}'`
pwprompt="-p$password" pwprompt="-p$password"
return 1;
else else
echo "MySQL Password file missing or incorrect, check .my.cnf file" echo "MySQL Password file missing or incorrect, check .my.cnf file"
rm -f /tmp/error.check rm -f /tmp/error.check
@@ -19,12 +20,6 @@ checkForError() {
sleep 2 sleep 2
exit 1; exit 1;
fi fi
else
echo "MySQL access error"
rm -f /tmp/error.check
$installdir/mysql/mysql-Columnstore stop
sleep 2
exit 1;
fi fi
rm -f /tmp/error.check rm -f /tmp/error.check
@@ -120,7 +115,7 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
$installdir/mysql/install_calpont_mysql.sh --password=$password --installdir=$installdir $installdir/mysql/install_calpont_mysql.sh --password=$password --installdir=$installdir
checkForError checkForError
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: missing or invalid password, or InfiniDB plugin install missing" echo "ERROR: Invalid password in .my.cnf, or Columnstore plugin install missing"
$installdir/mysql/mysql-Columnstore stop $installdir/mysql/mysql-Columnstore stop
sleep 2 sleep 2
exit 1; exit 1;