Commit a08a8bc1 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-22721: Fix GCC 5.3.1 -Wconversion

parent 79cdd7e7
...@@ -351,18 +351,18 @@ lock_check_trx_id_sanity( ...@@ -351,18 +351,18 @@ lock_check_trx_id_sanity(
dict_index_t* index, /*!< in: index */ dict_index_t* index, /*!< in: index */
const rec_offs* offsets) /*!< in: rec_get_offsets(rec, index) */ const rec_offs* offsets) /*!< in: rec_get_offsets(rec, index) */
{ {
ut_ad(rec_offs_validate(rec, index, offsets)); ut_ad(rec_offs_validate(rec, index, offsets));
ut_ad(!rec_is_metadata(rec, *index)); ut_ad(!rec_is_metadata(rec, *index));
trx_id_t max_trx_id = trx_sys.get_max_trx_id(); 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); 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)) { 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); lock_report_trx_id_insanity(trx_id, rec, index, offsets, max_trx_id);
return false; return false;
} }
return(true); return true;
} }
/*********************************************************************//** /*********************************************************************//**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment