rpms/mysql8.4
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use correct dir for config files

Browse Source
This commit is contained in:
Honza Horak 2015-01-25 19:53:08 +01:00 committed by Michal Schorm
parent 24e1d7e023
commit babed9f6e2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
community-mysql.spec
View File

@ -74,7 +74,7 @@
Name: community-mysql Name: community-mysql
Version: 5.6.22 Version: 5.6.22
Release: 4%{?with_debug:.debug}%{?dist} Release: 5%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com URL: http://www.mysql.com
@ -468,6 +468,7 @@ cmake .. \
-DNICE_PROJECT_NAME="MySQL" \ -DNICE_PROJECT_NAME="MySQL" \
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-DSYSCONFDIR="%{_sysconfdir}" \ -DSYSCONFDIR="%{_sysconfdir}" \
-DSYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
-DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \ -DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \
-DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \ -DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \
-DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_INCLUDEDIR=include/mysql \
@ -699,7 +700,6 @@ if [ $1 = 1 ]; then
fi fi
%endif %endif
/bin/touch %{logfile} /bin/touch %{logfile}
/bin/chmod 0755 %{dbdatadir}
%preun server %preun server
%if %{with init_systemd} %if %{with init_systemd}
@ -942,6 +942,9 @@ fi
%endif %endif
%changelog %changelog
* Sun Jan 25 2015 Honza Horak <hhorak@redhat.com> - 5.6.22-5
- Use correct dir for config files
* Sat Jan 24 2015 Honza Horak <hhorak@redhat.com> - 5.6.22-4 * Sat Jan 24 2015 Honza Horak <hhorak@redhat.com> - 5.6.22-4
- Move server settings to renamed config file under my.cnf.d dir - Move server settings to renamed config file under my.cnf.d dir

2
my.cnf.in
View File

@ -14,5 +14,5 @@ symbolic-links=0
# #
# include all files from the config directory # include all files from the config directory
# #
!includedir @INSTALL_SYSCONF2DIR@ !includedir @SYSCONF2DIR@

6
mysql-check-upgrade.sh
View File

@ -27,9 +27,9 @@ if [ $version -ne $thisversion ] ; then
cat <<EOF >&2 cat <<EOF >&2
The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps: The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
1. Back-up your data before running 'mysql_upgrade' 1. Back-up your data before with 'mysql_upgrade'
2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service' 2. Start the database daemon using 'service @DAEMON_NAME@ start'
3. Run 'mysql_upgrade' with a database user that has sufficent privileges 3. Run 'mysql_upgrade' with a database user that has sufficient privileges
Read more about 'mysql_upgrade' usage at: Read more about 'mysql_upgrade' usage at:
http://dev.mysql.com/doc/refman/5.6/en/mysql-upgrade.html http://dev.mysql.com/doc/refman/5.6/en/mysql-upgrade.html