mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follow-up to MDEV-11236/MDEV-14846 debug assertion

Browse source 
ha_innobase::unlock_row(): Use a relaxed version of the
trx_state_eq() debug assertion, because rr_unlock_row()
may be invoked after an error has been already reported
and the transaction has been rolled back.
This commit is contained in:
Marko Mäkelä 2018-03-15 19:48:29 +02:00
parent 723f87e9d3
commit dbb3960ad8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/handler/ha_innodb.cc
View file

@ -9040,7 +9040,7 @@ ha_innobase::unlock_row(void)
But there are some calls to this function from the SQL layer when the
transaction is in state TRX_STATE_NOT_STARTED. The check on
prebuilt->select_lock_type above gets around this issue. */
ut_ad(trx_state_eq(prebuilt->trx, TRX_STATE_ACTIVE));
ut_ad(trx_state_eq(prebuilt->trx, TRX_STATE_ACTIVE, true));
switch (prebuilt->row_read_type) {
case ROW_READ_WITH_LOCKS:

2
storage/xtradb/handler/ha_innodb.cc
View file

@ -9616,7 +9616,7 @@ ha_innobase::unlock_row(void)
But there are some calls to this function from the SQL layer when the
transaction is in state TRX_STATE_NOT_STARTED. The check on
prebuilt->select_lock_type above gets around this issue. */
ut_ad(trx_state_eq(prebuilt->trx, TRX_STATE_ACTIVE));
ut_ad(trx_state_eq(prebuilt->trx, TRX_STATE_ACTIVE, true));
switch (prebuilt->row_read_type) {
case ROW_READ_WITH_LOCKS: