database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix bug#45415: "rpm upgrade recreates test database"

Browse Source 
Let the creation of the "test" database happen only during a new
installation, not in an RPM upgrade.
This commit is contained in:
Joerg Bruehe
2011-07-07 17:22:24 +02:00
parent 1219d9a1dd
commit 535855eb75
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,13 +798,12 @@ else
fi fi
# echo "Analyzed: SERVER_TO_START=$SERVER_TO_START" # echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
if [ ! -d $mysql_datadir/mysql ] ; then if [ ! -d $mysql_datadir/mysql ] ; then
mkdir $mysql_datadir/mysql; mkdir $mysql_datadir/mysql $mysql_datadir/test
echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE
else else
# If the directory exists, we may assume it is an upgrade. # If the directory exists, we may assume it is an upgrade.
echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE
fi fi
if [ ! -d $mysql_datadir/test ] ; then mkdir $mysql_datadir/test; fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Make MySQL start/shutdown automatically when the machine does it. # Make MySQL start/shutdown automatically when the machine does it.
@ -837,7 +836,12 @@ chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Initiate databases if needed # Initiate databases if needed
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user} if ! grep '^MySQL RPM upgrade' $STATUS_FILE >/dev/null 2>&1 ; then
# Fix bug#45415: no "mysql_install_db" on an upgrade
# Do this as a negative to err towards more "install" runs
# rather than to miss one.
%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Upgrade databases if needed would go here - but it cannot be automated yet # Upgrade databases if needed would go here - but it cannot be automated yet
@ -1161,6 +1165,12 @@ fi
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Fix bug#45415: "rpm upgrade recreates test database"
Let the creation of the "test" database happen only during a new installation,
not in an RPM upgrade.
This affects both the "mkdir" and the call of "mysql_install_db".
* Thu Feb 03 2011 Joerg Bruehe <joerg.bruehe@oracle.com> * Thu Feb 03 2011 Joerg Bruehe <joerg.bruehe@oracle.com>