From 04a85451ac915af3a595c93e3b941a08dce6c9c2 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Jul 13 2017 14:30:08 +0000
Subject: Remove mysql-wait-* scripts. They aren't needed when using systemd "Type=notify"


---

diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index 2f935b3..27ac2d3 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -11,8 +11,6 @@
 +    mysql.service
 +    mysql@.service
 +    mysql-prepare-db-dir
-+    mysql-wait-ready
-+    mysql-wait-stop
 +    mysql-check-socket
 +    mysql-check-upgrade
 +    mysql-scripts-common
diff --git a/mariadb.spec b/mariadb.spec
index f37407f..21f5b16 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -126,7 +126,7 @@
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A community developed branch of MySQL
@@ -144,11 +144,9 @@ Source7:          README.mysql-license
 Source10:         mysql.tmpfiles.d.in
 Source11:         mysql.service.in
 Source12:         mysql-prepare-db-dir.sh
-Source13:         mysql-wait-ready.sh
 Source14:         mysql-check-socket.sh
 Source15:         mysql-scripts-common.sh
 Source16:         mysql-check-upgrade.sh
-Source17:         mysql-wait-stop.sh
 Source18:         mysql@.service.in
 Source19:         mysql.init.in
 Source50:         rh-skipped-tests-base.list
@@ -644,8 +642,8 @@ cat %{SOURCE51} | tee -a mysql-test/unstable-tests
 cat %{SOURCE51} | tee -a mysql-test/unstable-tests
 %endif
 
-cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
-   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \
+cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+   %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE18} %{SOURCE19} \
    %{SOURCE70} scripts
 
 %if %{with galera}
@@ -838,8 +836,6 @@ install -D -p -m 755 scripts/mysql.init %{buildroot}%{daemondir}/%{daemon_name}
 
 # helper scripts for service starting
 install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
-install -p -m 755 scripts/mysql-wait-ready %{buildroot}%{_libexecdir}/mysql-wait-ready
-install -p -m 755 scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop
 install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
 install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
 install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
@@ -1337,8 +1333,6 @@ fi
 
 %{daemondir}/%{daemon_name}*
 %{_libexecdir}/mysql-prepare-db-dir
-%{_libexecdir}/mysql-wait-ready
-%{_libexecdir}/mysql-wait-stop
 %{_libexecdir}/mysql-check-socket
 %{_libexecdir}/mysql-check-upgrade
 %{_libexecdir}/mysql-scripts-common
@@ -1433,6 +1427,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 13 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.7-2
+- Remove mysql-wait-* scripts. They aren't needed when using systemd "Type=notify"
+
 * Thu Jul 13 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.7-1
 - Rebase to 10.2.7
 - Get back mysql_config, its "--libmysqld-libs" is still needed
diff --git a/mysql.init.in b/mysql.init.in
index 879b001..146fcfa 100644
--- a/mysql.init.in
+++ b/mysql.init.in
@@ -64,12 +64,10 @@ start(){
     if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
-	ret=0
     elif [ $MYSQLDRUNNING = 1 ] && echo "$RESPONSE" | grep -q "Access denied for user"
     then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
-	ret=0
     else
         @libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP || return 4
         @libexecdir@/mysql-check-socket || return 1
@@ -86,19 +84,11 @@ start(){
 		--basedir=@prefix@ --user=$MYUSER >/dev/null 2>&1 &
 	safe_pid=$!
 
-	# Wait until the daemon is up
-        @libexecdir@/mysql-wait-ready "$safe_pid"
-        ret=$?
-
-	if [ $ret -eq 0 ]; then
-	    action $"Starting $prog: " /bin/true
-	    chmod o+r $pidfile >/dev/null 2>&1
-	    touch $lockfile
-	else
-	    action $"Starting $prog: " /bin/false
-	fi
+        action $"Starting $prog: " /bin/true
+        chmod o+r $pidfile >/dev/null 2>&1
+        touch $lockfile
     fi
-    return $ret
+    return 0
 }
 
 stop(){
diff --git a/mysql.service.in b/mysql.service.in
index 20bd97d..8292553 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -41,7 +41,6 @@ ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
 # per bug #547485
 ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
 ExecStartPost=@libexecdir@/mysql-check-upgrade
-ExecStopPost=@libexecdir@/mysql-wait-stop
 
 # Setting this to true can break replication and the Type=notify settings
 # See also bind-address mysqld option.
diff --git a/mysql@.service.in b/mysql@.service.in
index 9338c22..a6182aa 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -47,7 +47,6 @@ ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
 # per bug #547485
 ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
 ExecStartPost=@libexecdir@/mysql-check-upgrade
-ExecStopPost=@libexecdir@/mysql-wait-stop
 
 # Setting this to true can break replication and the Type=notify settings
 # See also bind-address mysqld option.