diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
| commit | c7a2fb1e086f9eaf03fe437326ecf32329b22e37 (patch) | |
| tree | b2c78e5f3ece211a308ee65779d400e655a8b469 /storage/innobase/lock | |
| parent | 9d479e2577aa0d8df3f26cb7a779c9478e423583 (diff) | |
| parent | 4612cb88fa8b391812db44327040a5878e5dbc44 (diff) | |
| download | mariadb-git-c7a2fb1e086f9eaf03fe437326ecf32329b22e37.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/lock')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 7c95e28b2da..86708818b36 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -351,18 +351,18 @@ lock_check_trx_id_sanity( dict_index_t* index, /*!< in: index */ const rec_offs* offsets) /*!< in: rec_get_offsets(rec, index) */ { - ut_ad(rec_offs_validate(rec, index, offsets)); - ut_ad(!rec_is_metadata(rec, *index)); + ut_ad(rec_offs_validate(rec, index, offsets)); + ut_ad(!rec_is_metadata(rec, *index)); - trx_id_t max_trx_id = trx_sys.get_max_trx_id(); - ut_ad(max_trx_id || srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN); + trx_id_t max_trx_id= trx_sys.get_max_trx_id(); + ut_ad(max_trx_id || srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN); - if (UNIV_LIKELY(max_trx_id) && UNIV_UNLIKELY(trx_id >= max_trx_id)) { - lock_report_trx_id_insanity( - trx_id, rec, index, offsets, max_trx_id); - return false; - } - return(true); + if (UNIV_LIKELY(max_trx_id != 0) && UNIV_UNLIKELY(trx_id >= max_trx_id)) + { + lock_report_trx_id_insanity(trx_id, rec, index, offsets, max_trx_id); + return false; + } + return true; } /*********************************************************************//** |