Merge 10.3 into 10.4

3 files changed, 17 insertions, 6 deletions

diff --git a/support-files/rpm/plugin-postin.sh b/support-files/rpm/plugin-postin.sh
new file mode 100644
index 00000000000..1844de1b4f2
--- /dev/null
+++ b/support-files/rpm/plugin-postin.sh
@@ -0,0 +1,3 @@
+# request the server restart
+mkdir -p %{restart_flag_dir}
+echo > %{restart_flag}
diff --git a/support-files/rpm/server-posttrans.sh b/support-files/rpm/server-posttrans.sh
new file mode 100644
index 00000000000..0d242596185
--- /dev/null
+++ b/support-files/rpm/server-posttrans.sh
@@ -0,0 +1,11 @@
+if [ -r %{restart_flag} ] ; then
+  rm %{restart_flag}
+  if [ -x /usr/bin/systemctl ] ; then
+    /usr/bin/systemctl daemon-reload > /dev/null 2>&1
+  fi
+
+  # only restart the server if it was alredy running
+  if %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1; then
+    %{_sysconfdir}/init.d/mysql restart
+  fi
+fi
diff --git a/support-files/rpm/server-postun.sh b/support-files/rpm/server-postun.sh
index 412c6f4c67b..27e1125b78f 100644
--- a/support-files/rpm/server-postun.sh
+++ b/support-files/rpm/server-postun.sh
@@ -1,10 +1,7 @@
 if [ $1 -ge 1 ]; then
-  if [ -x %{_sysconfdir}/init.d/mysql ] ; then
-    # only restart the server if it was alredy running
-    if %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1; then
-      %{_sysconfdir}/init.d/mysql restart
-    fi
-  fi
+  # request the server restart
+  mkdir -p %{restart_flag_dir}
+  echo > %{restart_flag}
 fi
 
 if [ $1 = 0 ] ; then