[Pkg-mysql-commits] [mariadb-5.5] 01/01: Fixed wrongly applied fix of MDEV-5957

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit f8035cbf19613dbcf4ce3f31f1678eb788fde4e2
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sun Jul 20 01:56:23 2014 +0300

    Fixed wrongly applied fix of MDEV-5957
---
 debian/changelog                     | 6 ++++++
 debian/mariadb-server-5.5.mysql.init | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9e6805..cf24710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mariadb-5.5 (5.5.38-2) unstable; urgency=low
+
+  * Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
+
+ -- Otto Kekäläinen <otto at seravo.fi>  Sat, 19 Jul 2014 23:43:33 +0300
+
 mariadb-5.5 (5.5.38-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init
index 1616b88..0ac1833 100644
--- a/debian/mariadb-server-5.5.mysql.init
+++ b/debian/mariadb-server-5.5.mysql.init
@@ -77,7 +77,7 @@ mysqld_status () {
     ps_alive=0
     pidfile=`mysqld_get_param pid-file`
     if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-    
+
     if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
        [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
 	return 0 # EXIT_SUCCESS
@@ -128,7 +128,7 @@ case "${1:-''}" in
 
   'stop')
 	# * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
-	# at least for cron, we can rely on it here, too. (although we have 
+	# at least for cron, we can rely on it here, too. (although we have
 	# to specify it explicit as e.g. sudo environments points to the normal
 	# users home and not /root)
 	log_daemon_msg "Stopping MariaDB database server" "mysqld"
@@ -161,6 +161,7 @@ case "${1:-''}" in
 
   'restart')
 	set +e; $SELF stop; set -e
+  shift
 	$SELF start "${@}"
 	;;
 
@@ -184,4 +185,3 @@ case "${1:-''}" in
 	exit 1
 	;;
 esac
-

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git