database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Bug#21527467 - RPM SCRIPTS FAIL WITH MULTIPLE DATADIR

Browse Source
This commit is contained in:
Balasubramanian Kandasamy
2015-08-26 19:29:00 +02:00
parent e414cbffad
commit b1895fb8c9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
support-files/mysql.spec.sh
View File

@ -635,7 +635,7 @@ install -m 644 "%{malloc_lib_source}" \
# Check local settings to support them. # Check local settings to support them.
if [ -x %{_bindir}/my_print_defaults ] if [ -x %{_bindir}/my_print_defaults ]
then then
mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'` mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'`
PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'` PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'`
fi fi
if [ -z "$mysql_datadir" ] if [ -z "$mysql_datadir" ]
@ -740,7 +740,7 @@ esac
STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
if [ -f $STATUS_FILE ]; then if [ -f "$STATUS_FILE" ]; then
echo "Some previous upgrade was not finished:" echo "Some previous upgrade was not finished:"
ls -ld $STATUS_FILE ls -ld $STATUS_FILE
echo "Please check its status, then do" echo "Please check its status, then do"
@ -811,7 +811,7 @@ fi
# Check local settings to support them. # Check local settings to support them.
if [ -x %{_bindir}/my_print_defaults ] if [ -x %{_bindir}/my_print_defaults ]
then then
mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'` mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'`
fi fi
if [ -z "$mysql_datadir" ] if [ -z "$mysql_datadir" ]
then then
@ -824,8 +824,8 @@ STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Create data directory if needed, check whether upgrade or install # Create data directory if needed, check whether upgrade or install
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if [ ! -d $mysql_datadir ] ; then mkdir -m 755 $mysql_datadir; fi if [ ! -d "$mysql_datadir" ] ; then mkdir -m 755 "$mysql_datadir" ; fi
if [ -f $STATUS_FILE ] ; then if [ -f "$STATUS_FILE" ] ; then
SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
else else
SERVER_TO_START='' SERVER_TO_START=''
@ -1003,7 +1003,7 @@ fi
# Check local settings to support them. # Check local settings to support them.
if [ -x %{_bindir}/my_print_defaults ] if [ -x %{_bindir}/my_print_defaults ]
then then
mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'` mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'`
fi fi
if [ -z "$mysql_datadir" ] if [ -z "$mysql_datadir" ]
then then
@ -1014,7 +1014,7 @@ NEW_VERSION=%{mysql_version}-%{release}
STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference! STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference!
STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
if [ -f $STATUS_FILE ] ; then if [ -f "$STATUS_FILE" ] ; then
SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
else else
# This should never happen, but let's be prepared # This should never happen, but let's be prepared