1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

MCOL-520 - move mysql_upgrade

This commit is contained in:
David Hill
2018-11-06 18:42:44 -06:00
parent a3e78d6b63
commit f49ad9a4a1
2 changed files with 33 additions and 50 deletions

View File

@ -44,7 +44,6 @@ checkForError() {
prefix=/usr/local
installdir=$prefix/mariadb/columnstore
rpmmode=install
password=" "
tmpdir="/tmp"
for arg in "$@"; do
@ -105,27 +104,6 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
sleep 5
# Run MariaDB (mysql) upgrade script, if it exist
if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
if [[ ${password} == " " ]]; then
$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
if [ $? -ne 0 ]; then
echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
$installdir/mysql/mysql-Columnstore stop
sleep 2
exit 2;
fi
else
$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf --password=$password > $tmpdir/mysql_upgrade.log
if [ $? -ne 0 ]; then
echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
$installdir/mysql/mysql-Columnstore stop
sleep 2
exit 2;
fi
fi
fi
# Install various Calpont stuff...
$installdir/mysql/install_calpont_mysql.sh --installdir=$installdir --tmpdir=$tmpdir
checkForError