Skip to content

Commit ae04dfd

Browse files
bkandasaHery Ramilison
authored andcommitted
Merge branch 'mysql-5.6' into mysql-5.7
(cherry picked from commit 153898735ffe5b63210e4344bf367f7e5e140f6a)
1 parent a628e8f commit ae04dfd

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

packaging/rpm-fedora/mysql.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ rm -r $(readlink var) var
517517
datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
518518
/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
519519
/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
520+
/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || :
520521
%systemd_post mysqld.service
521522
/usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
522523

packaging/rpm-oel/mysql.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@ rm -r $(readlink var) var
684684
datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
685685
/bin/chmod 0751 "$datadir" >/dev/null 2>&1 || :
686686
/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
687+
/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || :
687688
%if 0%{?systemd}
688689
%systemd_post mysqld.service
689690
/usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :

packaging/rpm-sles/mysql.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ rm -r $(readlink var) var
509509
datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p | tail -n 1')
510510
/bin/chmod 0751 "$datadir"
511511
/bin/touch /var/log/mysql/mysqld.log
512+
/bin/chown mysql:mysql /var/log/mysql/mysqld.log >/dev/null 2>&1 || :
512513
%if 0%{?systemd}
513514
%service_add_post mysql.service
514515
/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf >/dev/null 2>&1 || :

0 commit comments

Comments
 (0)