1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-21367: mysqld_safe log don't log to err.log

Browse Source 
Introduced with 6b7918d524d5 in `10.2` just check for helper and handle
it if exist.

Reviewed by: cvicentiu@mariadb.org
This commit is contained in:
Anel Husakovic 2020-03-05 16:40:29 +01:00
parent a82209ca31
commit eb7b14ec9a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/mysqld_safe.sh
View File

@ -155,7 +155,7 @@ log_generic () {
case $logging in case $logging in
init) ;; # Just echo the message, don't save it anywhere init) ;; # Just echo the message, don't save it anywhere
file) file)
if [ -n "$helper" ]; then if [ "$helper_exist" -eq "0" ]; then
echo "$msg" | "$helper" "$user" log "$err_log" echo "$msg" | "$helper" "$user" log "$err_log"
fi fi
;; ;;
@ -179,7 +179,7 @@ eval_log_error () {
local cmd="$1" local cmd="$1"
case $logging in case $logging in
file) file)
if [ -n "$helper" ]; then if [ "$helper_exist" -eq "0" ]; then
cmd="$cmd 2>&1 | "`shell_quote_string "$helper"`" $user log "`shell_quote_string "$err_log"` cmd="$cmd 2>&1 | "`shell_quote_string "$helper"`" $user log "`shell_quote_string "$err_log"`
fi fi
;; ;;
@ -551,10 +551,9 @@ fi
helper=`find_in_bin mysqld_safe_helper` helper=`find_in_bin mysqld_safe_helper`
print_defaults=`find_in_bin my_print_defaults` print_defaults=`find_in_bin my_print_defaults`
# Check if helper exists # Check if helper exists
$helper --help >/dev/null 2>&1 || helper="" command -v $helper --help >/dev/null 2>&1
helper_exist=$?
# #
# Second, try to find the data directory # Second, try to find the data directory
# #
@ -962,7 +961,6 @@ fi
# Avoid 'nohup: ignoring input' warning # Avoid 'nohup: ignoring input' warning
test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null" test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null"
log_notice "Starting $MYSQLD daemon with databases from $DATADIR" log_notice "Starting $MYSQLD daemon with databases from $DATADIR"
# variable to track the current number of "fast" (a.k.a. subsecond) restarts # variable to track the current number of "fast" (a.k.a. subsecond) restarts