summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-12-14 01:17:44 +1100
committerGitHub <noreply@github.com>2022-12-13 15:17:44 +0100
commitacfaa0458725708aa58970a34072d08c184d7856 (patch)
tree90955e0c92a33b6d5c5d045bf3349592bfb4f86a
parent8f30973234de520d95dfccca8409e5802b845331 (diff)
downloadmariadb-git-acfaa0458725708aa58970a34072d08c184d7856.tar.gz
MDEV-18591: mysql_install_db - pass --log-error to mysqld in install (#2363)
Previously we parsed it out in mysql_install_db for use in the error message, but failed to pass it to mysqld in the bootstrap. Also match log_error as it might appear in the .cnf files. Thanks Michal Schorm for the test case. Reviewed by: Faustin Lammler
-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 4c6376142cc..67d9f683b35 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/