diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 17:29:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 17:29:41 +0300 |
| commit | a08a8bc191952d5af0e03490abb38cdca6a4d9b2 (patch) | |
| tree | 3a0dd2b14bcad19d26c9091d38cc59b0cda02cbe /storage/innobase/lock | |
| parent | 79cdd7e76bbebf62629066166f43279095a0fcc9 (diff) | |
| download | mariadb-git-a08a8bc191952d5af0e03490abb38cdca6a4d9b2.tar.gz | |
MDEV-22721: Fix GCC 5.3.1 -Wconversion
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 e93348a463b..f11a2a35750 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; } /*********************************************************************//** |