diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2018-06-03 20:31:10 +1000 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2018-06-05 13:40:34 +0300 |
| commit | 88a263eabb7a7b993c135ba6b91ef969a7c41bd3 (patch) | |
| tree | 044078b5a7cb9b9d32a35030b5f4d7ab220a3ab2 | |
| parent | c10bed17ddaaa2635fe758a47d89a12c4169e31e (diff) | |
| download | mariadb-git-88a263eabb7a7b993c135ba6b91ef969a7c41bd3.tar.gz | |
MDEV-16318: mysqld_safe - partial revert on 64094e1
Revert part of 64094e1 because mysqld_safe isn't just used for
Debian. As such references to specific packaging files like
/etc/mysql/debian.cnf shouldn't have passed a review.
There's also no history of why 64094e1 was needed based on
the history of debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
Other distos have survived without mysqld_safe handling signals.
| -rw-r--r-- | scripts/mysqld_safe.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 2abdfd7faf5..5797bdc68d7 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -36,6 +36,7 @@ skip_err_log=0 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 @@ -159,7 +160,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):" \ @@ -877,13 +878,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 |