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

MCOL-520 - move mysql_upgrade

Browse Source
This commit is contained in:
David Hill
2018-11-06 16:58:33 -06:00
parent 16e956db02
commit b090339cab
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/install_scripts/module_installer.sh
View File

@@ -160,7 +160,7 @@ if [ $module = "um" ] || ( [ $module = "pm" ] && [ $PMwithUM = "y" ] ) || [ $Ser
fi fi
echo "Run post-mysqld-install" echo "Run post-mysqld-install"
$COLUMNSTORE_INSTALL_DIR/bin/post-mysqld-install --installdir=$COLUMNSTORE_INSTALL_DIR $mysqlPassword > ${tmpDir}/post-mysqld-install.log 2>&1 $COLUMNSTORE_INSTALL_DIR/bin/post-mysqld-install --installdir=$COLUMNSTORE_INSTALL_DIR $mysqlPassword --tmpdir=${tmpDir} > ${tmpDir}/post-mysqld-install.log 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: post-mysqld-install failed: check ${tmpDir}/post-mysqld-install.log" echo "ERROR: post-mysqld-install failed: check ${tmpDir}/post-mysqld-install.log"
exit 1 exit 1

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

@@ -45,6 +45,8 @@ prefix=/usr/local
installdir=$prefix/mariadb/columnstore installdir=$prefix/mariadb/columnstore
rpmmode=install rpmmode=install
password=" " password=" "
tmpdir="/tmp"
for arg in "$@"; do for arg in "$@"; do
if [ $(expr -- "$arg" : '--prefix=') -eq 9 ]; then if [ $(expr -- "$arg" : '--prefix=') -eq 9 ]; then
prefix="$(echo $arg | awk -F= '{print $2}')" prefix="$(echo $arg | awk -F= '{print $2}')"

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

@@ -8,6 +8,7 @@ prefix=/usr/local
installdir=$prefix/mariadb/columnstore installdir=$prefix/mariadb/columnstore
rpmmode=install rpmmode=install
user=mysql user=mysql
tmpdir="/tmp"
password=" " password=" "
pwprompt= pwprompt=
@@ -30,6 +31,8 @@ for arg in "$@"; do
user="`echo $arg | awk -F= '{print $2}'`" user="`echo $arg | awk -F= '{print $2}'`"
elif [ $(expr -- "$arg" : '--password=') -eq 11 ]; then elif [ $(expr -- "$arg" : '--password=') -eq 11 ]; then
password="$(echo $arg | awk -F= '{print $2}')" password="$(echo $arg | awk -F= '{print $2}')"
elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
tmpdir="$(echo $arg | awk -F= '{print $2}')"
else else
echo "post-mysqld-install: ignoring unknown argument: $arg" 1>&2 echo "post-mysqld-install: ignoring unknown argument: $arg" 1>&2
fi fi

2
oamapps/postConfigure/helpers.cpp
View File

@@ -260,7 +260,7 @@ void mysqlSetup()
if ( mysqlpw != oam::UnassignedName ) if ( mysqlpw != oam::UnassignedName )
passwordOption = " --password=" + mysqlpw; passwordOption = " --password=" + mysqlpw;
cmd = installDir + "/bin/post-mysqld-install --installdir=" + installDir + " " + passwordOption + " > " + tmpDir + "/post-mysqld-install.log 2>&1"; cmd = installDir + "/bin/post-mysqld-install --installdir=" + installDir + " " + passwordOption + " --tmpdir=" + tmpDir + " > " + tmpDir + "/post-mysqld-install.log 2>&1";
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) if (WEXITSTATUS(rtnCode) != 0)