database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Revert "MDEV-35019 Provide a way to enable "rollback XA on disconnect" behavior we had before 10.5.2"

Browse Source 
This reverts commit 8ae462a220.
This commit is contained in:
Sergei Golubchik
2024-10-16 13:23:47 +02:00
parent 8ae462a220
commit 5ebda30ccc
12 changed files with 1 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/suite/rpl/r/rpl_xa.result
View File

@@ -280,28 +280,4 @@ disconnect con1;
connection master;
xa commit '1';
drop table t2, t1;
# MDEV-35019 Provide a way to enable "rollback XA on disconnect" behavior we had before 10.5.2
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1), (3);
connect con1, localhost,root;
SET SESSION legacy_xa_rollback_at_disconnect= 1;
XA START '3';
INSERT INTO t1 VALUES (2);
XA END '3';
XA PREPARE '3';
disconnect con1;
connection master;
include/save_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
a
1
3
connection slave;
include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
a
1
3
connection master;
DROP TABLE t1;
include/rpl_end.inc

24
mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result
View File

@@ -289,30 +289,6 @@ disconnect con1;
connection master;
xa commit '1';
drop table t2, t1;
# MDEV-35019 Provide a way to enable "rollback XA on disconnect" behavior we had before 10.5.2
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1), (3);
connect con1, localhost,root;
SET SESSION legacy_xa_rollback_at_disconnect= 1;
XA START '3';
INSERT INTO t1 VALUES (2);
XA END '3';
XA PREPARE '3';
disconnect con1;
connection master;
include/save_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
a
1
3
connection slave;
include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
a
1
3
connection master;
DROP TABLE t1;
connection slave;
include/stop_slave.inc
SET @@global.gtid_pos_auto_engines="";

23
mysql-test/suite/rpl/t/rpl_xa.inc
View File

@@ -434,26 +434,3 @@ disconnect con1;
connection master;
xa commit '1';
drop table t2, t1;
--echo # MDEV-35019 Provide a way to enable "rollback XA on disconnect" behavior we had before 10.5.2
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1), (3);
connect con1, localhost,root;
SET SESSION legacy_xa_rollback_at_disconnect= 1;
XA START '3';
INSERT INTO t1 VALUES (2);
XA END '3';
XA PREPARE '3';
--disconnect con1
--connection master
--source include/save_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
--connection slave
--source include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER BY a;
--connection master
DROP TABLE t1;