Last commit made on 2022-06-21
Get this branch:
git clone -b bb-10.4-MDEV-26562-galera

Branch merges

Branch information


Recent commits

9de72a5... by Julius Goryavsky <email address hidden>

MDEV-28583 postfix: fixing .result files after automatic merge

75e5ae8... by Julius Goryavsky <email address hidden>

MDEV-26562: galera-sst-mariabackup is failing due to missing xtrabackup_checkpoints

This commit contains workaround for a bug known as 'Red Hat issue 1870279'
(connection reset by peer issue in socat versions to which
further causes crashes during SST using mariabackup (when openssl is used).

01c0345... by Vladislav Vaintroub

MDEV-28819 Statically compiled encryption plugins do not work in mariadb-backup

Disable static build for encryption plugin file_key_management

0565dfe... by Daniel Black

MDEV-17390: re-neable rpl_semi_sync_after_sync test

The reasons sited for disabling this test in MDEV-16172 where

c89e3b7... by Marko Mäkelä

Merge 10.3 into 10.4

9829313... by Marko Mäkelä

MDEV-28779: ALTER TABLE IMPORT TABLESPACE corrupts an encrypted table

PageConverter::update_header(): Remove an unnecessary write.
The field that was originally called FIL_PAGE_FILE_FLUSH_LSN only
made sense for the first page of the system tablespace
(initially, for the first page of each file of the system tablespace).
It never had any meaning for .ibd files, and it lost its original
meaning in MariaDB Server 10.8.1 when
commit b07920b634f455c39e3650c6163bec2a8ce0ffe0 (MDEV-27199)
removed the ability to start without ib_logfile0.

If the most significant 32 bits of the LSN are nonzero, this
unnecessary write would write the wrong encryption key identifier
to the page. The first page of any file is never encrypted,
so normally those bytes should be 0 for any .ibd file.

2cd1edf... by Daniel Lewart <email address hidden>

MDEV-25577 mariadb-tzinfo-to-sql generates superfluous warnings

The zoneinfo directory is littered with non-timezone information files.

These frequently contain extensions, not present in real timezone files.

Alo leapseconds is frequently there and is not a timezone file.

9c207c8... by GuiXiaoDi <email address hidden> fix for non-Red Hat platforms

The else condition is meant to be here to define the functions
if the Red Hat include file isn't there.

Fixes: commit 467011bcac3b3f42ae6f21dde8d88e78708b21d1 / MDEV-26614

RedHat -> Red Hat by Daniel Black

5efadf8... by Oleg Smirnov

MDEV-28747 Index condition pushdown may be configured incorrectly

ha_innobase::build_template may initialize m_prebuilt->idx_cond
even if there is no valid pushed_idx_cond_keyno.
This potentially problematic piece of code was found while
working on MDEV-27366

44ab6cb... by Marko Mäkelä

Cleanup: Remove unused error code DB_FORCED_ABORT

MariaDB never supported this form of preemption via high-priority
transactions. This error code shold not have been added in the
first place, in commit 2e814d4702d71a04388386a9f591d14a35980bfe.