diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
| commit | 8356fb68c366b7f515f9060d964ee598653756a6 (patch) | |
| tree | 310d7419ad32f74ad29b3da87dd1a21ab4d39dd7 /scripts | |
| parent | b5a54e8a9305885e2850d6dabde08ad369094ff3 (diff) | |
| parent | fe38d7cad4fab33beba90eefaea9e9d4aef06a7c (diff) | |
| download | mariadb-git-8356fb68c366b7f515f9060d964ee598653756a6.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/galera_recovery.sh | 2 | ||||
| -rwxr-xr-x | scripts/mariadb-service-convert | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh index 8df2abc3fd5..9ff5e4e5f50 100644 --- a/scripts/galera_recovery.sh +++ b/scripts/galera_recovery.sh @@ -68,7 +68,7 @@ parse_arguments() { wsrep_recover_position() { # Redirect server's error log to the log file. - eval @sbindir@/mysqld $cmdline_args --user=$user --wsrep_recover \ + eval @sbindir@/mariadbd $cmdline_args --user=$user --wsrep_recover \ --disable-log-error 2> "$log_file" ret=$? if [ $ret -ne 0 ]; then diff --git a/scripts/mariadb-service-convert b/scripts/mariadb-service-convert index 38043733554..e43b9b926d5 100755 --- a/scripts/mariadb-service-convert +++ b/scripts/mariadb-service-convert @@ -25,7 +25,7 @@ tz_old=$TZ -. /usr/bin/mysqld_safe --dry-run +. /usr/bin/mariadbd-safe --dry-run echo "# converted using $0" echo "#" diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 5265e708cb3..3411c53603b 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/ |