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

Read socketfile location in mariadb-prepare-db-dir script

Browse Source
This commit is contained in:
Honza Horák 2014-01-08 09:41:00 +01:00
parent 607492ed8a
commit cf12bcb35c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb-prepare-db-dir
View File

@ -21,6 +21,8 @@ get_mysql_option mysqld datadir "/var/lib/mysql"
datadir="$result" datadir="$result"
get_mysql_option mysqld_safe log-error "/var/log/mariadb/mariadb.log" get_mysql_option mysqld_safe log-error "/var/log/mariadb/mariadb.log"
errlogfile="$result" errlogfile="$result"
get_mysql_option mysqld socket "$datadir/mysql.sock"
socketfile="$result"
# Absorb configuration settings from the specified systemd service file, # Absorb configuration settings from the specified systemd service file,
# or the default "mysqld" service if not specified # or the default "mysqld" service if not specified

7
mariadb.spec
View File

@ -7,7 +7,7 @@
Name: mariadb Name: mariadb
Version: 5.5.34 Version: 5.5.34
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -512,7 +512,7 @@ cp -p %{SOURCE6} README.mysql-docs
cp -p %{SOURCE7} README.mysql-license cp -p %{SOURCE7} README.mysql-license
# install the list of skipped tests to be available for user runs # install the list of skipped tests to be available for user runs
install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test install -p -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
# remove unneeded RHEL-4 SELinux stuff # remove unneeded RHEL-4 SELinux stuff
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/SELinux/ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/SELinux/
@ -796,6 +796,9 @@ fi
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Wed Jan 8 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-4
- Read socketfile location in mariadb-prepare-db-dir script
* Mon Jan 6 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-3 * Mon Jan 6 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-3
- Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl - Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
which now makes mariadb/mysql FTBFS because openssl_1 test fails which now makes mariadb/mysql FTBFS because openssl_1 test fails