1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed misleading voariable names.

Browse Source
This commit is contained in:
Oleksandr Byelkin 2018-01-11 17:21:07 +01:00
parent abb9e703d2
commit a5285a8fb7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
storage/maria/ma_blockrec.c
View File

@ -6279,8 +6279,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
uchar *buff, *dir; uchar *buff, *dir;
uint result; uint result;
MARIA_PINNED_PAGE page_link; MARIA_PINNED_PAGE page_link;
enum pagecache_page_lock unlock_method; enum pagecache_page_lock lock_method;
enum pagecache_page_pin unpin_method; enum pagecache_page_pin pin_method;
my_off_t end_of_page; my_off_t end_of_page;
uint error; uint error;
DBUG_ENTER("_ma_apply_redo_insert_row_head_or_tail"); DBUG_ENTER("_ma_apply_redo_insert_row_head_or_tail");
@ -6308,8 +6308,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
fill it entirely with zeroes, then the REDO will put correct data on fill it entirely with zeroes, then the REDO will put correct data on
it. it.
*/ */
unlock_method= PAGECACHE_LOCK_WRITE; lock_method= PAGECACHE_LOCK_WRITE;
unpin_method= PAGECACHE_PIN; pin_method= PAGECACHE_PIN;
DBUG_ASSERT(rownr == 0 && new_page); DBUG_ASSERT(rownr == 0 && new_page);
if (rownr != 0 || !new_page) if (rownr != 0 || !new_page)
@ -6324,8 +6324,8 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
} }
else else
{ {
unlock_method= PAGECACHE_LOCK_LEFT_WRITELOCKED; lock_method= PAGECACHE_LOCK_LEFT_WRITELOCKED;
unpin_method= PAGECACHE_PIN_LEFT_PINNED; pin_method= PAGECACHE_PIN_LEFT_PINNED;
share->pagecache->readwrite_flags&= ~MY_WME; share->pagecache->readwrite_flags&= ~MY_WME;
buff= pagecache_read(share->pagecache, &info->dfile, buff= pagecache_read(share->pagecache, &info->dfile,
@ -6427,11 +6427,11 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn,
this group, for this page, would be skipped) and unpin then. this group, for this page, would be skipped) and unpin then.
*/ */
result= 0; result= 0;
if (unlock_method == PAGECACHE_LOCK_WRITE && if (lock_method == PAGECACHE_LOCK_WRITE &&
pagecache_write(share->pagecache, pagecache_write(share->pagecache,
&info->dfile, page, 0, &info->dfile, page, 0,
buff, PAGECACHE_PLAIN_PAGE, buff, PAGECACHE_PLAIN_PAGE,
unlock_method, unpin_method, lock_method, pin_method,
PAGECACHE_WRITE_DELAY, &page_link.link, PAGECACHE_WRITE_DELAY, &page_link.link,
LSN_IMPOSSIBLE)) LSN_IMPOSSIBLE))
result= my_errno; result= my_errno;
@ -6452,7 +6452,7 @@ crashed_file:
_ma_set_fatal_error(share, HA_ERR_WRONG_IN_RECORD); _ma_set_fatal_error(share, HA_ERR_WRONG_IN_RECORD);
err: err:
error= my_errno; error= my_errno;
if (unlock_method == PAGECACHE_LOCK_LEFT_WRITELOCKED) if (lock_method == PAGECACHE_LOCK_LEFT_WRITELOCKED)
pagecache_unlock_by_link(share->pagecache, page_link.link, pagecache_unlock_by_link(share->pagecache, page_link.link,
PAGECACHE_LOCK_WRITE_UNLOCK, PAGECACHE_LOCK_WRITE_UNLOCK,
PAGECACHE_UNPIN, LSN_IMPOSSIBLE, PAGECACHE_UNPIN, LSN_IMPOSSIBLE,