summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 06:20:04 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 06:20:04 +0200
commitf97f6955bdaec26774488cf9c7bcefca0cc767d4 (patch)
tree266210edb99179220e0efe5d72ae7147faafa99b /scripts
parent87eccd78a791ff3acfa00914254f0bf858a14aa4 (diff)
parent697dbd15e0102f33fba1d1d6d9aa964b638f9534 (diff)
downloadmariadb-git-f97f6955bdaec26774488cf9c7bcefca0cc767d4.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 7e6e256db70..e358aeea551 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/