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

Clean up trx_undo_page_get_end()

parent 6058f92f
...@@ -193,21 +193,15 @@ inline ...@@ -193,21 +193,15 @@ inline
uint16_t uint16_t
trx_undo_page_get_end(const page_t* undo_page, ulint page_no, ulint offset) trx_undo_page_get_end(const page_t* undo_page, ulint page_no, ulint offset)
{ {
uint16_t end;
if (page_no == page_get_page_no(undo_page)) { if (page_no == page_get_page_no(undo_page)) {
end = mach_read_from_2(offset + TRX_UNDO_NEXT_LOG + undo_page); if (uint16_t end = mach_read_from_2(TRX_UNDO_NEXT_LOG
+ offset + undo_page)) {
if (end == 0) { return end;
end = mach_read_from_2(undo_page + TRX_UNDO_PAGE_HDR
+ TRX_UNDO_PAGE_FREE);
} }
} else {
end = mach_read_from_2(undo_page + TRX_UNDO_PAGE_HDR
+ TRX_UNDO_PAGE_FREE);
} }
return(end); return mach_read_from_2(TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_FREE
+ undo_page);
} }
/******************************************************************//** /******************************************************************//**
......
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