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

MDEV-34204 Assertion `!*detailed_error' failed on shutdown after XA PREPARE

Browse Source 
trx_free_at_shutdown(): Similar to trx_t::commit_in_memory(),
clear the detailed_error (FOREIGN KEY constraint error) before
invoking trx_t::free(). We only do this on debug instrumented
builds in order to avoid a debug assertion failure on shutdown.
This commit is contained in:
Marko Mäkelä
2024-05-21 09:52:35 +03:00
parent 698dae54ef
commit 0907df3d89
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/innodb/r/xa_recovery.result
View File

@@ -1,4 +1,4 @@
CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
connect con1,localhost,root; connect con1,localhost,root;
XA START 'x'; XA START 'x';
@@ -6,7 +6,7 @@ UPDATE t1 set a=2;
XA END 'x'; XA END 'x';
XA PREPARE 'x'; XA PREPARE 'x';
connect con2,localhost,root; connect con2,localhost,root;
CREATE TABLE t2 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
XA START 'y'; XA START 'y';
INSERT INTO t2 VALUES (1); INSERT INTO t2 VALUES (1);
XA END 'y'; XA END 'y';
@@ -29,7 +29,18 @@ XA ROLLBACK 'x';
SELECT * FROM t1; SELECT * FROM t1;
a a
1 1
DROP TABLE t1; CREATE TABLE t3(a INT PRIMARY KEY REFERENCES t1(a)) ENGINE=InnoDB;
XA START 'a';
INSERT INTO t3 SET a=1;
INSERT INTO t3 SET a=42;
ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t3`, CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))
XA END 'a';
XA PREPARE 'a';
SET GLOBAL innodb_fast_shutdown=0; SET GLOBAL innodb_fast_shutdown=0;
# restart # restart
XA COMMIT 'a';
SELECT * FROM t3;
a
1
DROP TABLE t3,t1;
XA ROLLBACK 'y'; XA ROLLBACK 'y';

15
mysql-test/suite/innodb/t/xa_recovery.test
View File

@@ -10,12 +10,12 @@ call mtr.add_suppression("Found [12] prepared XA transactions");
FLUSH TABLES; FLUSH TABLES;
--enable_query_log --enable_query_log
CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
connect (con1,localhost,root); connect (con1,localhost,root);
XA START 'x'; UPDATE t1 set a=2; XA END 'x'; XA PREPARE 'x'; XA START 'x'; UPDATE t1 set a=2; XA END 'x'; XA PREPARE 'x';
connect (con2,localhost,root); connect (con2,localhost,root);
CREATE TABLE t2 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
XA START 'y'; INSERT INTO t2 VALUES (1); XA END 'y'; XA PREPARE 'y'; XA START 'y'; INSERT INTO t2 VALUES (1); XA END 'y'; XA PREPARE 'y';
connection default; connection default;
@@ -53,9 +53,18 @@ SELECT * FROM t1;
XA ROLLBACK 'x'; XA ROLLBACK 'x';
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; CREATE TABLE t3(a INT PRIMARY KEY REFERENCES t1(a)) ENGINE=InnoDB;
XA START 'a';
INSERT INTO t3 SET a=1;
--error ER_NO_REFERENCED_ROW_2
INSERT INTO t3 SET a=42;
XA END 'a';
XA PREPARE 'a';
SET GLOBAL innodb_fast_shutdown=0; SET GLOBAL innodb_fast_shutdown=0;
--source include/restart_mysqld.inc --source include/restart_mysqld.inc
XA COMMIT 'a';
SELECT * FROM t3;
DROP TABLE t3,t1;
XA ROLLBACK 'y'; XA ROLLBACK 'y';

1
storage/innobase/trx/trx0trx.cc
View File

@@ -554,6 +554,7 @@ trx_free_at_shutdown(trx_t *trx)
trx->state = TRX_STATE_NOT_STARTED; trx->state = TRX_STATE_NOT_STARTED;
ut_ad(!UT_LIST_GET_LEN(trx->lock.trx_locks)); ut_ad(!UT_LIST_GET_LEN(trx->lock.trx_locks));
trx->id = 0; trx->id = 0;
ut_d(*trx->detailed_error = '\0');
trx->free(); trx->free();
} }