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

[Honza Horak]

commit cf12bcb35c10287705d61923a134a8a97d642fde
Author: Honza Horák <hhorak at redhat.com>
Date:   Wed Jan 8 09:41:00 2014 +0100

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

 mariadb-prepare-db-dir |    2 ++
 mariadb.spec           |    7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/mariadb-prepare-db-dir b/mariadb-prepare-db-dir
index c4c333f..8a7d3e1 100644
--- a/mariadb-prepare-db-dir
+++ b/mariadb-prepare-db-dir
@@ -21,6 +21,8 @@ get_mysql_option mysqld datadir "/var/lib/mysql"
 datadir="$result"
 get_mysql_option mysqld_safe log-error "/var/log/mariadb/mariadb.log"
 errlogfile="$result"
+get_mysql_option mysqld socket "$datadir/mysql.sock"
+socketfile="$result"
 
 # Absorb configuration settings from the specified systemd service file,
 # or the default "mysqld" service if not specified
diff --git a/mariadb.spec b/mariadb.spec
index 2c8cf02..0a64e1a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -7,7 +7,7 @@
 
 Name: mariadb
 Version: 5.5.34
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -512,7 +512,7 @@ cp -p %{SOURCE6} README.mysql-docs
 cp -p %{SOURCE7} README.mysql-license
 
 # 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
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/SELinux/
@@ -796,6 +796,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Jan  8 2014 Honza Horak <hhorak at redhat.com> 1:5.5.34-4
+- Read socketfile location in mariadb-prepare-db-dir script
+
 * Mon Jan  6 2014 Honza Horak <hhorak at redhat.com> 1:5.5.34-3
 - 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