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.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 12:15:36 +02:00
parent d3e4de529b fec2fd6add
commit 683fbced6b
727 changed files with 22650 additions and 8324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mariadb_system_tables_fix.sql
View File

@@ -773,19 +773,22 @@ if @have_innodb then
end if //
DELIMITER ;
# MDEV-4332 longer user names
# MDEV-4332 longer user names, extended by MDEV-24312 to longer again.
alter table user modify User char(128) binary not null default '';
alter table db modify User char(128) binary not null default '';
alter table tables_priv modify User char(128) binary not null default '';
alter table columns_priv modify User char(128) binary not null default '';
alter table procs_priv modify User char(128) binary not null default '';
alter table procs_priv modify User char(128) binary not null default '', modify Host char(255) binary DEFAULT '';
alter table proc modify definer varchar(384) collate utf8mb3_bin not null default '';
alter table proxies_priv modify User char(128) COLLATE utf8mb3_bin not null default '';
alter table proxies_priv modify User char(128) COLLATE utf8mb3_bin not null default '', modify Host char(255) binary DEFAULT '';
alter table proxies_priv modify Proxied_user char(128) COLLATE utf8mb3_bin not null default '';
alter table proxies_priv modify Grantor varchar(384) COLLATE utf8mb3_bin not null default '';
alter table servers modify Username char(128) not null default '';
alter table procs_priv modify Grantor varchar(384) COLLATE utf8mb3_bin not null default '';
alter table tables_priv modify Grantor varchar(384) COLLATE utf8mb3_bin not null default '';
# MDEV-33726 longer names from MDEV-24312 extension
alter table if exists global_priv modify Host char(255) binary DEFAULT '', modify User char(128) binary not null default '';
alter table if exists roles_mapping modify Host char(255) binary not null DEFAULT '', modify User char(128) binary not null default '';
# Activate the new, possible modified privilege tables
# This should not be needed, but gives us some extra testing that the above

9
scripts/wsrep_sst_mariabackup.sh
View File

@@ -803,7 +803,8 @@ recv_joiner()
if [ $tmt -gt 0 ]; then
if [ -n "$(commandex timeout)" ]; then
local koption=0
if [ "$OS" = 'FreeBSD' ]; then
if [ "$OS" = 'FreeBSD' -o "$OS" = 'NetBSD' -o "$OS" = 'OpenBSD' -o \
"$OS" = 'DragonFly' ]; then
if timeout 2>&1 | grep -qw -F -- '-k'; then
koption=1
fi
@@ -1166,12 +1167,6 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
iopts="--databases-exclude='lost+found'${iopts:+ }$iopts"
if [ ${FORCE_FTWRL:-0} -eq 1 ]; then
wsrep_log_info "Forcing FTWRL due to environment variable" \
"FORCE_FTWRL equal to $FORCE_FTWRL"
iopts="--no-backup-locks${iopts:+ }$iopts"
fi
# if compression is enabled for backup files, then add the
# appropriate options to the mariadb-backup command line:
if [ "$compress" != 'none' ]; then