postmerge changes

include/pagecache.h

@@ -213,7 +213,7 @@ extern void pagecache_unlock_by_link(PAGECACHE *pagecache,
                                      PAGECACHE_PAGE_LINK *link,
                                      enum pagecache_page_lock lock,
                                      enum pagecache_page_pin pin,
-                                     pgcache_page_no_t pageno,
+                                     LSN first_REDO_LSN_for_page,
                                      LSN lsn);
 extern void pagecache_unpin(PAGECACHE *pagecache,
                             PAGECACHE_FILE *file,
@@ -225,11 +225,11 @@ extern void pagecache_unpin_by_link(PAGECACHE *pagecache,
 extern int flush_pagecache_blocks(PAGECACHE *keycache,
                                   PAGECACHE_FILE *file,
                                   enum flush_type type);
-extern my_bool pagecache_delete_page(PAGECACHE *pagecache,
-                                     PAGECACHE_FILE *file,
-                                     pgcache_page_no_t pageno,
-                                     enum pagecache_page_lock lock,
-                                     my_bool flush);
+extern my_bool pagecache_delete(PAGECACHE *pagecache,
+                                PAGECACHE_FILE *file,
+                                pgcache_page_no_t pageno,
+                                enum pagecache_page_lock lock,
+                                my_bool flush);
 extern my_bool pagecache_delete_pages(PAGECACHE *pagecache,
                                       PAGECACHE_FILE *file,
                                       pgcache_page_no_t pageno,

storage/maria/ma_blockrec.c

@@ -571,8 +571,9 @@ void _ma_unpin_all_pages(MARIA_HA *info, LSN undo_lsn)
   DBUG_ASSERT(undo_lsn != 0 || info->s->base.transactional == 0);
 
   while (pinned_page-- != page_link)
-    pagecache_unlock(info->s->pagecache, pinned_page->link,
-                     pinned_page->unlock, PAGECACHE_UNPIN, 0, undo_lsn);
+    pagecache_unlock_by_link(info->s->pagecache, pinned_page->link,
+                             pinned_page->unlock, PAGECACHE_UNPIN,
+                             0, undo_lsn);
 
   info->pinned_pages.elements= 0;
   DBUG_VOID_RETURN;

storage/maria/ma_pagecache.c

@@ -2258,7 +2258,7 @@ static my_bool make_lock_and_pin(PAGECACHE *pagecache,
                          block->pins,
                          page_cache_page_lock_str[lock],
                          page_cache_page_pin_str[pin]));
-    BLOCK_INFO(block);
+    PCBLOCK_INFO(block);
   }
 #endif
 
@@ -3067,8 +3067,8 @@ my_bool pagecache_delete_pages(PAGECACHE *pagecache,
   page_end= pageno + page_count;
   do
   {
-    if (pagecache_delete_page(pagecache, file, pageno,
-                              lock, flush))
+    if (pagecache_delete(pagecache, file, pageno,
+                         lock, flush))
       DBUG_RETURN(1);
   } while (++pageno != page_end);
   DBUG_RETURN(0);