nn-11.3-merge : lp:maria : Git : Code : MariaDB

Get this branch:: git clone -b nn-11.3-merge https://git.launchpad.net/maria

Branch merges

Branch information

Name:: nn-11.3-merge

Repository:: lp:maria

Recent commits

883f984... by Oleksandr "Sanja" Byelkin on 2023-11-14

Merge branch 'nn-11.2-merge' into bb-11.3-release

f59c06e... by Oleksandr "Sanja" Byelkin on 2023-11-14

Merge branch '11.2' into bb-11.2-release

e6acddf... by Nikita Malyavin on 2023-11-14

main.alter_table_online_debug: fix race in XA tests

d59d883... by Nikita Malyavin on 2023-11-13

MDEV-32771 Server crash upon online alter with concurrent XA

In case of a non-recovery XA rollback/commit in the same connection,
thon->rollback is called instead of rollback_by_xid, Though previously,
thd_ha_data was moved to thd->transaction->xid_state.xid in hton->prepare.

Like it wasn't enough, XA PREPARE can be skipped upon user and thus we
can end up in hton->commit/rollback with and unprepared XA, so checking
xid_state.is_explicit_XA is not enough -- we should check
xid_state.get_state_code() == XA_PREPARED, which will also guarantee
is_explicit_XA() == true.

5a8eafe... by Oleksandr "Sanja" Byelkin on 2023-11-10