rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix mysql-prepare-db-dir

Browse Source 
Resolves: #1335849
This commit is contained in:
Jakub Dorňák 2016-05-26 16:16:11 +02:00
parent 782ee21209
commit cb04c7ab87
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb.spec
View File

@ -123,7 +123,7 @@
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -1279,6 +1279,10 @@ fi
%endif %endif
%changelog %changelog
* Thu May 26 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-2
- Fix mysql-prepare-db-dir
Resolves: #1335849
* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-1 * Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-1
- Update to 10.2.0 - Update to 10.2.0

4
mysql-prepare-db-dir.sh
View File

@ -55,8 +55,8 @@ chown "$myuser:$mygroup" "$errlogfile"
chmod 0640 "$errlogfile" chmod 0640 "$errlogfile"
[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
# Make the data directory # Make the data directory if doesn't exist or empty
if [ ! -d "$datadir/mysql" ] ; then if ! ls $datadir/* &>/dev/null; then
# First, make sure $datadir is there with correct permissions # First, make sure $datadir is there with correct permissions
# (note: if it's not, and we're not root, this'll fail ...) # (note: if it's not, and we're not root, this'll fail ...)
if [ ! -e "$datadir" -a ! -h "$datadir" ] if [ ! -e "$datadir" -a ! -h "$datadir" ]