[Pkg-mysql-commits] [mariadb-5.5] 01/03: Applied patch from 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 2f78ab8bc31cbc10de22bea21fdf162076ddd14c
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Mar 28 17:54:46 2014 +0200

    Applied patch from MDEV-5957
---
 debian/changelog                     | 7 +++++++
 debian/mariadb-server-5.5.mysql.init | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1acfdba..cbce6b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mariadb-5.5 (5.5.36-2) unstable; urgency=low
+
+  * Applied patch to log init output better
+    (Closes https://mariadb.atlassian.net/browse/MDEV-5957)
+
+ -- Otto Kekäläinen <otto at seravo.fi>  Fri, 28 Mar 2014 17:55:06 +0200
+
 mariadb-5.5 (5.5.36-1) unstable; urgency=low
 
   [ Otto Kekäläinen ]
diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init
index 07edda2..1616b88 100644
--- a/debian/mariadb-server-5.5.mysql.init
+++ b/debian/mariadb-server-5.5.mysql.init
@@ -105,8 +105,8 @@ case "${1:-''}" in
 	    # Could be removed during boot
 	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
 
-	    # Start MariaDB! 
-  	    /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 &
+	    # Start MariaDB!
+  	    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
 
 	    # 6s was reported in #352070 to be too few when using ndbcluster
 	    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
@@ -161,7 +161,7 @@ case "${1:-''}" in
 
   'restart')
 	set +e; $SELF stop; set -e
-	$SELF start 
+	$SELF start "${@}"
 	;;
 
   'reload'|'force-reload')

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