database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-520 - move mysql_upgrade

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
oam/install_scripts/post-mysql-install
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

7
oam/install_scripts/post-mysqld-install
View File

@@ -77,6 +77,9 @@ fi
# InfiniDB testing hook...
test -x /usr/local/bin/idb-testing-mysql-pre-start && /usr/local/bin/idb-testing-mysql-pre-start $installdir/mysql
# If DB exist, run upgrade script if it exist
if [ -d $installdir/mysql/db/calpontsys ]; then
if [ -x $installdir/mysql/mysql-Columnstore ]; then
# Restart in the same way that mysqld will be started normally.
$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
@@ -87,6 +90,7 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
# Run MariaDB (mysql) upgrade script, if it exist
if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
echo "Running mysql_upgrade script"
if [[ ${password} == " " ]]; then
$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
if [ $? -ne 0 ]; then
@@ -107,9 +111,10 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
fi
# stop
$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
$installdir/mysql/mysql-Columnstore stop
sleep 2
fi
fi
### Don't give the user the notes, we'll fix them ourselves...
$installdir/mysql/scripts/mysql_install_db --rpm --user=$user --defaults-extra-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null