diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
commit | 8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (patch) | |
tree | 3e2c81b24b86a194243fe3e7913393e96de99991 /scripts | |
parent | c4938eafc594d6d64e5a17be13c337ada0beb63d (diff) | |
parent | fb0808c450849e00993fa38839f33969a9daf7e8 (diff) | |
download | mariadb-git-8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_install_db.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 13fdb06d339..579ed849815 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -148,7 +148,9 @@ parse_arguments() --builddir=*) builddir=`parse_arg "$arg"` ;; --srcdir=*) srcdir=`parse_arg "$arg"` ;; --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; - --log-error=*) + --log[-_]error=*) + # Keep in the arguments passed to the server + args="$args $arg" log_error=`parse_arg "$arg"` ;; # Note that the user will be passed to mysqld so that it runs # as 'user' (crucial e.g. if log-bin=/some_other_path/ |