[Pkg-mysql-commits] [pkg-mariadb] 02/03: Commit dpkg-source forced fix

[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 pkg-mariadb.

commit e6618ac1ec34a9cd81e177b375cea3ce08b904bb
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Sun Dec 22 18:36:02 2013 +0200

    Commit dpkg-source forced fix
---
 debian/patches/mysqld_safe-extrafix | 64 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 65 insertions(+)

diff --git a/debian/patches/mysqld_safe-extrafix b/debian/patches/mysqld_safe-extrafix
new file mode 100644
index 0000000..225396e
--- /dev/null
+++ b/debian/patches/mysqld_safe-extrafix
@@ -0,0 +1,64 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ mariadb-5.5 (5.5.34-1) precise; urgency=low
+ .
+   * Merged with new release from upstream
+Author: Otto Kekäläinen <otto at seravo.fi>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mariadb-5.5-5.5.34.orig/scripts/mysqld_safe.sh
++++ mariadb-5.5-5.5.34/scripts/mysqld_safe.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+ # This file is public domain and comes with NO WARRANTY of any kind
+ #
+@@ -32,6 +32,7 @@ err_log=
+ syslog_tag_mysqld=mysqld
+ syslog_tag_mysqld_safe=mysqld_safe
+ 
++trap '' 1 2 3 15			# we shouldn't let anyone kill us
+ 
+ # MySQL-specific environment variable. First off, it's not really a umask,
+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
+@@ -162,7 +163,7 @@ eval_log_error () {
+       # sed buffers output (only GNU sed supports a -u (unbuffered) option)
+       # which means that messages may not get sent to syslog until the
+       # mysqld process quits.
+-      cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait"
++      cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error"
+       ;;
+     *)
+       echo "Internal program error (non-fatal):" \
+@@ -804,13 +805,6 @@ then
+ fi
+ 
+ #
+-# From now on, we catch signals to do a proper shutdown of mysqld
+-# when signalled to do so.
+-#
+-trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh & wait' 1 # HUP
+-trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM
+-
+-#
+ # Uncomment the following lines if you want all tables to be automatically
+ # checked and repaired during startup. You should add sensible key_buffer
+ # and sort_buffer values to my.cnf to improve check performance or require
diff --git a/debian/patches/series b/debian/patches/series
index 7a9cbb3..8b1c32e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 44_scripts__mysql_config__libs.diff
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
+mysqld_safe-extrafix

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