diff options
| author | Monty <monty@mariadb.org> | 2023-03-16 17:57:34 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2023-03-19 21:41:17 +0200 |
| commit | 7b032b01cd94e5c96c527ad3dc620e255961a80d (patch) | |
| tree | 1a01ccfc270966f45ae4ba93500fa329f1b2cee3 /scripts | |
| parent | 7343a2ceb67e4e408e24f3b28a714e106ffe804a (diff) | |
| download | mariadb-git-7b032b01cd94e5c96c527ad3dc620e255961a80d.tar.gz | |
Fixed newly introduced bug in scripts/mysql_install_db
In some cases, the errors would not be written to the log.
This was however not critical as in most cases mysql_install_db
should not normally write anything to the log.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 065aa7bd3fe..3b14437b5d1 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -24,7 +24,6 @@ builddir="" ldata="@localstatedir@" langdir="" srcdir="" -log_error="" args="" defaults="" @@ -551,12 +550,20 @@ else filter_cmd_line="cat" fi -# Disable log error if the user don't have write access to the directory. -# This is common when a user tries to install a personal mariadbd server -if test -n $log_error +# Disable log error if the user don't have right to write/create the file +# This is common when a user tries to install a personal mariadbd server and +# the global config in /etc is using --log-error. +# The server will internally change log-error to stderr to stderr if it cannot +# write the the log file. This code only disables the error message from a not +# writable log-error, which can be confusing. +if test -n "$log_error" then - if test ! -w $log_error + if test \( -e "$log_error" -a \! -w "$log_error" \) -o \( ! -e "$log_error" -a ! -w "`dirname "$log_error"`" \) then + if test -n "$verbose" + then + echo "resetting log-error '$log_error' because no write access" + fi log_error="" args="$args --skip-log-error" fi |