database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge 11.2 into 11.3

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-27 10:48:29 +03:00
parent c4a506f0bf d0f8dfbcf0
commit 7b842f1536
511 changed files with 15169 additions and 29021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result
View File

@@ -217,3 +217,11 @@ master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Query # # use `test`; INSERT INTO tm VALUES (1),(1)
master-bin.000001 # Query # # COMMIT
DROP TABLE tm;
connection default;
SET pseudo_slave_mode=1;
XA START 'a';
XA END 'a';
XA PREPARE 'a';
XA ROLLBACK 'a';
ERROR XA100: XA_RBROLLBACK: Transaction branch was rolled back
include/show_binlog_events.inc

12
mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test
View File

@@ -134,3 +134,15 @@ XA ROLLBACK '1';
--source include/show_binlog_events.inc
DROP TABLE tm;
# MDEV-32257 dangling XA-rollback in binlog from emtpy XA
--connection default
--let $binlog_start = query_get_value(SHOW MASTER STATUS, Position, 1)
--let $binlog_file = query_get_value(SHOW MASTER STATUS, File, 1)
SET pseudo_slave_mode=1;
XA START 'a';
XA END 'a';
XA PREPARE 'a';
--error ER_XA_RBROLLBACK
XA ROLLBACK 'a';
--source include/show_binlog_events.inc