Merge remote-tracking branch 'origin/master' into csn

Conflicts:
	src/backend/access/transam/multixact.c
	src/backend/replication/logical/reorderbuffer.c
	src/backend/replication/logical/snapbuild.c

diff --cc doc/src/sgml/func.sgml
Simple merge

diff --cc src/backend/access/heap/heapam.c
Simple merge

diff --cc src/backend/access/rmgrdesc/xactdesc.c
Simple merge

diff --cc src/backend/access/transam/multixact.c
index f54678ac763c40a110171d3442a909796d559a06,459f59cb4e0e4ab5a45e9323a3db7e5dc498d1ad..edeb84da260c8005880276505b7c346ffe3de9c5
--- 1/src/backend/access/transam/multixact.c
--- 2/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@@ -456,11 -456,9 +456,11 @@@ MultiXactIdExpand(MultiXactId multi, Tr
  
        for (i = 0, j = 0; i < nmembers; i++)
        {
 -              if (TransactionIdIsInProgress(members[i].xid) ||
 +              TransactionIdStatus xidstatus = TransactionIdGetStatus(members[i].xid);
 +
 +              if (xidstatus == XID_INPROGRESS ||
-                       ((members[i].status > MultiXactStatusForUpdate) &&
+                       (ISUPDATE_from_mxstatus(members[i].status) &&
 -                       TransactionIdDidCommit(members[i].xid)))
 +                       xidstatus == XID_COMMITTED))
                {
                        newMembers[j].xid = members[i].xid;
                        newMembers[j++].status = members[i].status;

diff --cc src/backend/access/transam/xact.c
Simple merge

diff --cc src/backend/access/transam/xlog.c
Simple merge

diff --cc src/backend/catalog/index.c
Simple merge

diff --cc src/backend/commands/tablecmds.c
Simple merge

diff --cc src/backend/commands/vacuumlazy.c
Simple merge

diff --cc src/backend/postmaster/pgstat.c
Simple merge

diff --cc src/backend/replication/logical/reorderbuffer.c
index 2fe7d5fba31fcb204df993ce99633992fc2f9f0f,a2b2adb173260aeddb8bb6ad4f5dc4b2a3582715..304b2569bb21ebe806e9a30cb11b041ab3ab5431
--- 1/src/backend/replication/logical/reorderbuffer.c
--- 2/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@@ -2951,8 -2974,8 +2947,8 @@@ UpdateLogicalMappings(HTAB *tuplecid_da
        for(off = 0; off < list_length(files); off++)
        {
                RewriteMappingFile *f = files_a[off];
-               elog(DEBUG1, "applying mapping: %s in %u", f->fname,
+               elog(DEBUG1, "applying mapping: \"%s\" in %u", f->fname,
 -                      snapshot->subxip[0]);
 +                      snapshot->this_xip[0]);
                ApplyLogicalMappingFile(tuplecid_data, relid, f->fname);
                pfree(f);
        }

diff --cc src/include/catalog/pg_proc.h
Simple merge

diff --cc src/test/regress/expected/rules.out
Simple merge