Skip to content

M
MariaDB
Commit 08d39bdf authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge fixup: -Wconversion 

In merge cc1d9062 the 32-bit builds
were broken.
parent 13076bd3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
storage/innobase/trx/trx0undo.cc
View file @ 08d39bdf
...@@ -467,7 +467,7 @@ static uint16_t trx_undo_header_create(buf_block_t *undo_page, trx_id_t trx_id, ...@@ -467,7 +467,7 @@ static uint16_t trx_undo_header_create(buf_block_t *undo_page, trx_id_t trx_id,
mtr->write<8,mtr_t::MAYBE_NOP>(*undo_page, free + TRX_UNDO_TRX_ID + mtr->write<8,mtr_t::MAYBE_NOP>(*undo_page, free + TRX_UNDO_TRX_ID +
undo_page->frame, trx_id); undo_page->frame, trx_id);
if (UNIV_UNLIKELY(mach_read_from_8(free + TRX_UNDO_TRX_NO + if (UNIV_UNLIKELY(mach_read_from_8(free + TRX_UNDO_TRX_NO +
undo_page->frame))) undo_page->frame) != 0))
mtr->memset(undo_page, free + TRX_UNDO_TRX_NO, 8, 0); mtr->memset(undo_page, free + TRX_UNDO_TRX_NO, 8, 0);
/* Write TRX_UNDO_NEEDS_PURGE=1 and TRX_UNDO_LOG_START. */ /* Write TRX_UNDO_NEEDS_PURGE=1 and TRX_UNDO_LOG_START. */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7