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

MDEV-18078 Assertion `trnman_has_locked_tables(trn) > 0' failed

Browse Source 
Problem was that in case of implicit rollback for alter table
Aria did try to run commit twice.

The test case for this is tricky to do in 10.2, so it will
be added to 10.4 as part of BACKUP STAGE testing.
This commit is contained in:
Michael Widenius 2019-06-18 14:32:24 +03:00
parent 71eea0c3fb
commit b23c82fef3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/maria/ha_maria.cc
View File

@ -2743,7 +2743,8 @@ int ha_maria::external_lock(THD *thd, int lock_type)
}
else
{
TRN *trn= (file->trn != &dummy_transaction_object ? file->trn : 0);
/* We have to test for THD_TRN to protect against implicit commits */
TRN *trn= (file->trn != &dummy_transaction_object && THD_TRN ? file->trn : 0);
/* End of transaction */
/*