Merge branch 'master' into repl

Conflicts:
	src/backend/storage/lmgr/predicate.c

diff --cc src/backend/storage/lmgr/predicate.c
index 776091055e0a0980dd7c245514aafd3193c1114d,5ac762499105a83c3061f68bc1de9dbbe8b0b8af..b110c15a89c1b552b5e1905a19539d24df3c2718
--- 1/src/backend/storage/lmgr/predicate.c
--- 2/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@@ -155,11 -155,6 +155,8 @@@
   *                               BlockNumber newblkno);
   *        PredicateLockPageCombine(Relation relation, BlockNumber oldblkno,
   *                                 BlockNumber newblkno);
-  *        PredicateLockTupleRowVersionLink(const Relation relation,
-  *                                         const HeapTuple oldTuple,
-  *                                         const HeapTuple newTuple)
 + *        TransferPredicateLocksToHeapRelation(const Relation relation)
 + *        DropAllPredicateLocksFromTable(const Relation relation)
   *        ReleasePredicateLocks(bool isCommit)
   *
   * conflict detection (may also trigger rollback)

diff --cc src/include/storage/predicate.h
index 8ff0f7fae8928987df8b653a69af974d47f42a50,77ae8f904d01cdca3f886329d654539422b92b2e..a1e585db2cbf670bdf5e1068200eb115d564e7b2
--- 1/src/include/storage/predicate.h
--- 2/src/include/storage/predicate.h
+++ b/src/include/storage/predicate.h
@@@ -47,11 -47,8 +47,10 @@@ extern void RegisterPredicateLockingXid
  extern void PredicateLockRelation(const Relation relation);
  extern void PredicateLockPage(const Relation relation, const BlockNumber blkno);
  extern void PredicateLockTuple(const Relation relation, const HeapTuple tuple);
- extern void PredicateLockTupleRowVersionLink(const Relation relation, const HeapTuple oldTuple, const HeapTuple newTuple);
  extern void PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno, const BlockNumber newblkno);
  extern void PredicateLockPageCombine(const Relation relation, const BlockNumber oldblkno, const BlockNumber newblkno);
 +extern void TransferPredicateLocksToHeapRelation(const Relation relation);
 +extern void DropAllPredicateLocksFromTable(const Relation relation);
  extern void ReleasePredicateLocks(const bool isCommit);
  
  /* conflict detection (may also trigger rollback) */