mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +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.
140 lines
2.6 KiB
Text
140 lines
2.6 KiB
Text
#
|
|
# WL#1756
|
|
#
|
|
-- source include/have_innodb.inc
|
|
|
|
# Save the initial number of concurrent sessions
|
|
--source include/count_sessions.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
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;
|
|
|
|
xa start 'test2';
|
|
--error ER_XAER_RMFAIL
|
|
xa start 'test-bad';
|
|
insert t1 values (20);
|
|
--error ER_XAER_RMFAIL
|
|
xa prepare 'test2';
|
|
xa end 'test2';
|
|
xa prepare 'test2';
|
|
xa commit 'test2';
|
|
select * from t1;
|
|
|
|
xa start 'testa','testb';
|
|
insert t1 values (30);
|
|
|
|
--error ER_XAER_RMFAIL
|
|
commit;
|
|
|
|
xa end 'testa','testb';
|
|
|
|
--error ER_XAER_RMFAIL
|
|
begin;
|
|
--error ER_XAER_RMFAIL
|
|
create table t2 (a int);
|
|
|
|
connect (con1,localhost,root,,);
|
|
connection con1;
|
|
|
|
--error ER_XAER_DUPID
|
|
xa start 'testa','testb';
|
|
--error ER_XAER_DUPID
|
|
xa start 'testa','testb', 123;
|
|
|
|
# gtrid [ , bqual [ , formatID ] ]
|
|
xa start 0x7465737462, 0x2030405060, 0xb;
|
|
insert t1 values (40);
|
|
xa end 'testb',' 0@P`',11;
|
|
xa prepare 'testb',0x2030405060,11;
|
|
|
|
--error ER_XAER_RMFAIL
|
|
start transaction;
|
|
|
|
xa recover;
|
|
|
|
# uncomment the line below when binlog will be able to prepare
|
|
#disconnect con1;
|
|
connection default;
|
|
|
|
xa prepare 'testa','testb';
|
|
|
|
xa recover;
|
|
|
|
--error ER_XAER_NOTA
|
|
xa commit 'testb',0x2030405060,11;
|
|
xa rollback 'testa','testb';
|
|
|
|
--error ER_PARSE_ERROR
|
|
xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';
|
|
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
disconnect con1;
|
|
|
|
#
|
|
# Bug#28323: Server crashed in xid cache operations
|
|
#
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
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');
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
--connection con1
|
|
xa start 'a','b';
|
|
update t1 set c = 'aa' where a = 1;
|
|
--connection con2
|
|
xa start 'a','c';
|
|
update t1 set c = 'bb' where a = 2;
|
|
--connection con1
|
|
--send update t1 set c = 'bb' where a = 2
|
|
--connection con2
|
|
--sleep 1
|
|
--error ER_LOCK_DEADLOCK
|
|
update t1 set c = 'aa' where a = 1;
|
|
select count(*) from t1;
|
|
--error ER_XA_RBDEADLOCK
|
|
xa end 'a','c';
|
|
xa rollback 'a','c';
|
|
--disconnect con2
|
|
|
|
connect (con3,localhost,root,,);
|
|
--connection con3
|
|
xa start 'a','c';
|
|
|
|
--disconnect con1
|
|
--disconnect con3
|
|
--connection default
|
|
drop table t1;
|
|
|
|
--echo End of 5.0 tests
|
|
|
|
#
|
|
# Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()
|
|
#
|
|
|
|
xa start 'a';
|
|
xa end 'a';
|
|
xa rollback 'a';
|
|
xa start 'a';
|
|
xa end 'a';
|
|
xa rollback 'a';
|
|
|
|
# Wait till all disconnects are completed
|
|
--source include/wait_until_count_sessions.inc
|
|
|