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 11.7 into main

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 17:55:44 +02:00
parent e64857c25b 33907f9ec6
commit f0961301c8
455 changed files with 6810 additions and 4327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysql_install_db.sh
View File

@@ -639,7 +639,7 @@ else
echo "--general-log gives you a log in $ldata that may be helpful."
link_to_help
echo "You can find the latest source at https://downloads.mariadb.org and"
echo "the maria-discuss email list at https://launchpad.net/~maria-discuss"
echo "the MariaDB discuss email list at https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/"
echo
echo "Please check all of the above before submitting a bug report"
echo "at https://mariadb.org/jira"

10
scripts/wsrep_sst_mariabackup.sh
View File

@@ -854,7 +854,7 @@ recv_joiner()
wsrep_log_error "receiving process ended without creating" \
"magic file ($MAGIC_FILE)"
wsrep_log_info "Contents of datadir:"
wsrep_log_info $(ls -l "$dir/"*)
wsrep_log_info "$(ls -l "$dir"/*)"
exit 32
fi
@@ -957,17 +957,17 @@ if [ $ssyslog -eq 1 ]; then
wsrep_log_error()
{
logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}
wsrep_log_warning()
{
logger -p daemon.warning -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.warning -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}
wsrep_log_info()
{
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}
else
wsrep_log_error "logger not in path: $PATH. Ignoring"
@@ -1411,7 +1411,7 @@ else # joiner
# Compact backups are not supported by mariadb-backup
if grep -qw -F 'compact = 1' "$DATA/mariadb_backup_checkpoints"; then
wsrep_log_info "Index compaction detected"
wsrel_log_error "Compact backups are not supported by mariadb-backup"
wsrep_log_error "Compact backups are not supported by mariadb-backup"
exit 2
fi

2
scripts/wsrep_sst_rsync.sh
View File

@@ -108,7 +108,7 @@ check_pid_and_port()
if [ $ss_available -ne 0 -o $sockstat_available -ne 0 ]; then
if [ $ss_available -ne 0 ]; then
port_info=$($socket_utility $ss_opts -t "( sport = :$port )" 2>/dev/null | \
grep -E '[[:space:]]users:[[:space:]]?(' | \
grep -E '[[:space:]]users:[[:space:]]?\(' | \
grep -o -E "([^[:space:]]+[[:space:]]+){4}[^[:space:]]+" || :)
else
if [ $sockstat_available -gt 1 ]; then