diff options
| author | Anel Husakovic <anel@mariadb.org> | 2020-03-05 16:40:29 +0100 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-12-01 13:32:20 +0100 |
| commit | 60fec912ad33ca1d9557da87e501db3e9e8bbd57 (patch) | |
| tree | 2452422d45c7bd291c8d3b9b203073bf649b3a04 | |
| parent | a64257ef7484ef7c4913a19c1a2b9da54fe36a94 (diff) | |
| download | mariadb-git-60fec912ad33ca1d9557da87e501db3e9e8bbd57.tar.gz | |
MDEV-21367: mysqld_safe log don't log to err.log
Introduced with 6b7918d524d5 in `10.2` just check for helper and handle
it if exist.
Reviewed by: cvicentiu@mariadb.org
| -rw-r--r-- | scripts/mysqld_safe.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 0110653be90..dc2c0db8e40 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -155,7 +155,7 @@ log_generic () { case $logging in init) ;; # Just echo the message, don't save it anywhere file) - if [ -n "$helper" ]; then + if [ "$helper_exist" -eq "0" ]; then echo "$msg" | "$helper" "$user" log "$err_log" fi ;; @@ -179,7 +179,7 @@ eval_log_error () { local cmd="$1" case $logging in 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"` fi ;; @@ -551,10 +551,9 @@ fi helper=`find_in_bin mysqld_safe_helper` print_defaults=`find_in_bin my_print_defaults` - # 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 # @@ -962,7 +961,6 @@ fi # Avoid 'nohup: ignoring input' warning test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null" - log_notice "Starting $MYSQLD daemon with databases from $DATADIR" # variable to track the current number of "fast" (a.k.a. subsecond) restarts |