database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/11.2' into 11.4

Browse Source
This commit is contained in:
Alexander Barkov
2024-06-17 14:53:54 +04:00
parent c9414ccd67 a21e49cbcc
commit c4bf4ce948
252 changed files with 4073 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/mysql_install_db.sh
View File

@@ -38,6 +38,7 @@ force=0
in_rpm=0
ip_only=0
cross_bootstrap=0
do_resolve=0
auth_root_authentication_method=socket
auth_root_socket_user=""
skip_test_db=0
@@ -336,6 +337,11 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mariadbd"
if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
then
do_resolve=1
fi
# Configure paths to support files
if test -n "$srcdir"
then
@@ -428,7 +434,7 @@ fi
hostname=`@HOSTNAME@`
# Check if hostname is valid
if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
if test "$do_resolve" -eq 1
then
resolved=`"$resolveip" $hostname 2>&1`
if test $? -ne 0
@@ -454,7 +460,7 @@ then
fi
fi
if test "$ip_only" -eq 1
if test "$do_resolve" -eq 1 -a "$ip_only" -eq 1
then
hostname=`echo "$resolved" | while read a; do echo ${a##* }; done`
fi

12
scripts/wsrep_sst_mariabackup.sh
View File

@@ -714,7 +714,7 @@ cleanup_at_exit()
fi
# Final cleanup
pgid=$(ps -o pgid= $$ 2>/dev/null | grep -o -E '[0-9]+' || :)
pgid=$(ps -o 'pgid=' $$ 2>/dev/null | grep -o -E '[0-9]+' || :)
# This means no setsid done in mysqld.
# We don't want to kill mysqld here otherwise.
@@ -1086,17 +1086,19 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
tmpdir=$(parse_cnf "$encgroups" 'tmpdir')
if [ -z "$tmpdir" ]; then
xtmpdir="$(mktemp -d)"
itmpdir="$(mktemp -d)"
elif [ "$OS" = 'Linux' ]; then
xtmpdir=$(mktemp '-d' "--tmpdir=$tmpdir")
xtmpdir=$(mktemp -d "--tmpdir=$tmpdir")
itmpdir=$(mktemp -d "--tmpdir=$tmpdir")
else
xtmpdir=$(TMPDIR="$tmpdir"; mktemp '-d')
xtmpdir=$(TMPDIR="$tmpdir"; mktemp -d)
itmpdir=$(TMPDIR="$tmpdir"; mktemp -d)
fi
wsrep_log_info "Using '$xtmpdir' as mariadb-backup temporary directory"
tmpopts=" --tmpdir='$xtmpdir'"
itmpdir="$(mktemp -d)"
wsrep_log_info "Using '$itmpdir' as mariadb-abackup working directory"
wsrep_log_info "Using '$itmpdir' as mariadb-backup working directory"
usrst=0
if [ -n "$WSREP_SST_OPT_USER" ]; then