From 9def760e7ed1582d66d5f45d59e6af56b8b1ba59 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Fri, 17 Jan 2014 10:34:51 +0100
Subject: [PATCH] Use compatibility mysqld.service instead of link Related:
 #1014311

---
 mariadb.service |  2 ++
 mariadb.spec    |  5 ++++-
 mysqld.service  | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 mysqld.service

diff --git a/mariadb.service b/mariadb.service
index 89cbd1a..795e05a 100644
--- a/mariadb.service
+++ b/mariadb.service
@@ -26,6 +26,7 @@
 Description=MariaDB database server
 After=syslog.target
 After=network.target
+BindsTo=mysqld.service
 
 [Service]
 Type=simple
@@ -46,3 +47,4 @@ PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
+Also=mysqld.service
diff --git a/mariadb.spec b/mariadb.spec
index b1f1a19..ebc07af 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -48,6 +48,7 @@ Source12: mariadb-prepare-db-dir
 Source13: mariadb-wait-ready
 Source14: rh-skipped-tests-base.list
 Source15: rh-skipped-tests-arm.list
+Source16: mysqld.service
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 Source999: filter-requires-mysql.sh
 
@@ -461,7 +462,7 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
 # install systemd unit files and scripts for handling server startup
 mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
 install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/
-ln -s mariadb.service ${RPM_BUILD_ROOT}%{_unitdir}/mysqld.service
+install -p -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}%{_unitdir}/mysqld.service
 install -p -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/
 install -p -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
 
@@ -805,6 +806,8 @@ fi
 * Tue Jan 14 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.34-9
 - Adopt compatible system versioning
   Related: #1045013
+- Use compatibility mysqld.service instead of link
+  Related: #1014311
 
 * Mon Jan 13 2014 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.34-8
 - move mysql_config alternatives scriptlets to -devel too
diff --git a/mysqld.service b/mysqld.service
new file mode 100644
index 0000000..04db97c
--- /dev/null
+++ b/mysqld.service
@@ -0,0 +1,12 @@
+Unit]
+Description=MySQL compatibility service (another name for mariadb.service; you should use mariadb.service instead)
+BindsTo=mariadb.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/true
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+Also=mariadb.service