1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-35653 Assertion `commit_trx' failed in int innobase_commit(handlerton*, THD*, bool)

Browse Source 
cherry-pick adc1beb8680f from 11.7
This commit is contained in:
Sergei Golubchik 2025-03-21 19:31:47 +01:00
parent 31c06951c6
commit da9d575516
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storage/innobase/handler/ha_innodb.cc
View File

@ -4653,10 +4653,9 @@ innobase_commit(
ut_ad("invalid state" == 0);
/* fall through */
case TRX_STATE_PREPARED:
ut_ad(commit_trx || trx->is_wsrep());
ut_ad(thd_test_options(thd, OPTION_NOT_AUTOCOMMIT
| OPTION_BEGIN)
|| trx->is_wsrep());
ut_ad(commit_trx ||
!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT
| OPTION_BEGIN));
/* fall through */
case TRX_STATE_ACTIVE:
/* Transaction is deregistered only in a commit or a