mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
12f91b1d8c
The problem is that when a optimization of read-only transactions (bypass 2-phase commit) was implemented, it removed the code that reseted the XID once a transaction wasn't active anymore: sql/sql_parse.cc: - bzero(&thd->transaction.stmt, sizeof(thd->transaction.stmt)); - if (!thd->active_transaction()) - thd->transaction.xid_state.xid.null(); + thd->transaction.stmt.reset(); This mostly worked fine as the transaction commit and rollback functions (in handler.cc) reset the XID once the transaction is ended. But those functions wouldn't reset the XID in case of a empty transaction, leading to a assertion when a new starting a new XA transaction. The solution is to ensure that the XID state is reset when empty transactions are ended (by either commit or rollback). This is achieved by reorganizing the code so that the transaction cleanup routine is invoked whenever a transaction is ended. mysql-test/r/xa.result: Add test case result for Bug#44672 mysql-test/t/xa.test: Add test case for Bug#44672 sql/handler.cc: Invoke transaction cleanup function whenever a transaction is ended. Move XID state reset logic to the transaction cleanup function. sql/sql_class.h: Add XID state reset logic.
83 lines
2.6 KiB
Text
83 lines
2.6 KiB
Text
drop table if exists t1, t2;
|
|
create table t1 (a int) engine=innodb;
|
|
xa start 'test1';
|
|
insert t1 values (10);
|
|
xa end 'test1';
|
|
xa prepare 'test1';
|
|
xa rollback 'test1';
|
|
select * from t1;
|
|
a
|
|
xa start 'test2';
|
|
xa start 'test-bad';
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
|
|
insert t1 values (20);
|
|
xa prepare 'test2';
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
|
|
xa end 'test2';
|
|
xa prepare 'test2';
|
|
xa commit 'test2';
|
|
select * from t1;
|
|
a
|
|
20
|
|
xa start 'testa','testb';
|
|
insert t1 values (30);
|
|
commit;
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
|
|
xa end 'testa','testb';
|
|
begin;
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state
|
|
create table t2 (a int);
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state
|
|
xa start 'testa','testb';
|
|
ERROR XAE08: XAER_DUPID: The XID already exists
|
|
xa start 'testa','testb', 123;
|
|
ERROR XAE08: XAER_DUPID: The XID already exists
|
|
xa start 0x7465737462, 0x2030405060, 0xb;
|
|
insert t1 values (40);
|
|
xa end 'testb',' 0@P`',11;
|
|
xa prepare 'testb',0x2030405060,11;
|
|
start transaction;
|
|
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the PREPARED state
|
|
xa recover;
|
|
formatID gtrid_length bqual_length data
|
|
11 5 5 testb 0@P`
|
|
xa prepare 'testa','testb';
|
|
xa recover;
|
|
formatID gtrid_length bqual_length data
|
|
11 5 5 testb 0@P`
|
|
1 5 5 testatestb
|
|
xa commit 'testb',0x2030405060,11;
|
|
ERROR XAE04: XAER_NOTA: Unknown XID
|
|
xa rollback 'testa','testb';
|
|
xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';
|
|
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
|
select * from t1;
|
|
a
|
|
20
|
|
drop table t1;
|
|
drop table if exists t1;
|
|
create table t1(a int, b int, c varchar(20), primary key(a)) engine = innodb;
|
|
insert into t1 values(1, 1, 'a');
|
|
insert into t1 values(2, 2, 'b');
|
|
xa start 'a','b';
|
|
update t1 set c = 'aa' where a = 1;
|
|
xa start 'a','c';
|
|
update t1 set c = 'bb' where a = 2;
|
|
update t1 set c = 'bb' where a = 2;
|
|
update t1 set c = 'aa' where a = 1;
|
|
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
|
select count(*) from t1;
|
|
count(*)
|
|
2
|
|
xa end 'a','c';
|
|
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
|
|
xa rollback 'a','c';
|
|
xa start 'a','c';
|
|
drop table t1;
|
|
End of 5.0 tests
|
|
xa start 'a';
|
|
xa end 'a';
|
|
xa rollback 'a';
|
|
xa start 'a';
|
|
xa end 'a';
|
|
xa rollback 'a';
|