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

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.
MariaDB · Mar 15, 2018 · dbb3960 · dbb3960
1 parent 723f87e
commit dbb3960
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -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:

diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
@@ -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: